Browse Source

Move shared mkosi settings to a single file in mkosi.default.d/

master
Daan De Meyer 2 years ago committed by Luca Boccassi
parent
commit
6242cda99d
  1. 9
      .github/workflows/mkosi.yml
  2. 2
      .gitignore
  3. 17
      .mkosi/mkosi.arch
  4. 16
      .mkosi/mkosi.debian
  5. 19
      .mkosi/mkosi.fedora
  6. 19
      .mkosi/mkosi.opensuse
  7. 16
      .mkosi/mkosi.ubuntu
  8. 20
      mkosi.default.d/10-systemd.conf

9
.github/workflows/mkosi.yml

@ -29,11 +29,14 @@ jobs:
- name: Install
run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect
- name: Symlink
run: ln -s .mkosi/mkosi.${{ matrix.distro }} mkosi.default
- name: Build ${{ matrix.distro }}
run: sudo python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless build
run: sudo python3 -m mkosi --password= --qemu-headless build
- name: Boot ${{ matrix.distro }} systemd-nspawn
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless boot
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless boot
- name: Boot ${{ matrix.distro }} QEMU
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless qemu
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless qemu

2
.gitignore vendored

@ -36,4 +36,6 @@ __pycache__/
/mkosi.builddir/
/mkosi.output/
/mkosi.default
mkosi.default.d/*
!mkosi.default.d/10-systemd.conf
/tags

17
.mkosi/mkosi.arch

@ -8,16 +8,7 @@
[Distribution]
Distribution=arch
[Output]
Format=raw_btrfs
Bootable=yes
HostonlyInitrd=yes
[Partitions]
RootSize=3G
[Packages]
Cache=/var/cache/pacman/pkg/
BuildPackages=
acl
bzip2
@ -61,11 +52,3 @@ Packages=
qrencode
strace
vi
[Host]
QemuHeadless=yes
NetworkVeth=yes
[Validation]
Password=
Autologin=yes

16
.mkosi/mkosi.debian

@ -7,14 +7,6 @@
Distribution=debian
Release=unstable
[Output]
Format=raw_btrfs
Bootable=yes
HostonlyInitrd=yes
[Partitions]
RootSize=2G
[Packages]
BuildPackages=
acl
@ -77,11 +69,3 @@ Packages=
nano
strace
vim-tiny
[Host]
QemuHeadless=yes
NetworkVeth=yes
[Validation]
Password=
Autologin=yes

19
.mkosi/mkosi.fedora

@ -7,14 +7,6 @@
Distribution=fedora
Release=33
[Output]
Format=gpt_ext4
Bootable=yes
HostonlyInitrd=yes
[Partitions]
RootSize=3G
[Packages]
BuildPackages=
audit-libs-devel
@ -84,14 +76,3 @@ Packages=
strace
tpm2-tss
vi
BuildDirectory=mkosi.builddir
Cache=mkosi.cache
[Host]
QemuHeadless=yes
NetworkVeth=yes
[Validation]
Password=
Autologin=yes

19
.mkosi/mkosi.opensuse

@ -7,18 +7,7 @@
Distribution=opensuse
Release=tumbleweed
[Output]
Format=raw_btrfs
Bootable=yes
HostonlyInitrd=yes
[Partitions]
RootSize=3G
[Packages]
# Uncomment to share system RPM cache (works only with Tumbleweed)
#Cache=/var/cache/zypp/packages
BuildDirectory=mkosi.builddir
BuildPackages=
docbook-xsl-stylesheets
fdupes
@ -81,11 +70,3 @@ Packages=
strace
util-linux
vi
[Host]
QemuHeadless=yes
NetworkVeth=yes
[Validation]
Password=
Autologin=yes

16
.mkosi/mkosi.ubuntu

@ -8,14 +8,6 @@ Distribution=ubuntu
Release=focal
Repositories=main,universe
[Output]
Format=raw_btrfs
Bootable=yes
HostonlyInitrd=yes
[Partitions]
RootSize=2G
[Packages]
BuildPackages=
acl
@ -80,11 +72,3 @@ Packages=
nano
strace
vim-tiny
[Host]
QemuHeadless=yes
NetworkVeth=yes
[Validation]
Password=
Autologin=yes

20
mkosi.default.d/10-systemd.conf

@ -0,0 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
[Output]
Format=gpt_btrfs
Bootable=yes
HostonlyInitrd=yes
[Packages]
BuildDirectory=mkosi.builddir
Cache=mkosi.cache
[Host]
QemuHeadless=yes
NetworkVeth=yes
[Validation]
Password=
Autologin=yes
Loading…
Cancel
Save