From: Daan De Meyer Date: Wed, 2 Apr 2025 12:27:45 +0000 (+0200) Subject: mkosi: Move all mkosi configuration into mkosi/ subdirectory X-Git-Tag: v258-rc1~926^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=342d21ef19391fdb7fc41548ad48f5b1e7423943;p=thirdparty%2Fsystemd.git mkosi: Move all mkosi configuration into mkosi/ subdirectory Now that mkosi can automatically pick up its main configuration from a mkosi/ subdirectory if it exists and there is no configuration in the top level directory, let's make use of it to reduce the amount of clutter in the top level directory of the repository. This will also make it easier to install the mkosi configuration files as part of the testing packages later on. --- diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 96da8a0f981..29d2f8d32b1 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -53,7 +53,7 @@ jobs: # XXX: drop after the HyperV bug that breaks secure boot KVM guests is solved sed -i "s/'firmware'\s*:\s*'auto'/'firmware' : 'uefi'/g" test/*/meson.build - tee mkosi.local.conf < .packit_rpm/systemd.spec.new' - bash -c 'echo "%define meson_extra_configure_options --werror" >> .packit_rpm/systemd.spec.new' - bash -c 'cat .packit_rpm/systemd.spec >> .packit_rpm/systemd.spec.new' diff --git a/docs/HACKING.md b/docs/HACKING.md index 6baa3ae393a..c076aa303bf 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -86,7 +86,7 @@ not required to write basic patches. By default, `mkosi` will first build a tools tree and use it build the image and provide the environment for `mkosi sandbox`. To disable the tools tree and use -binaries from your host instead, write the following to `mkosi.local.conf`: +binaries from your host instead, write the following to `mkosi/mkosi.local.conf`: ```conf [Build] @@ -317,6 +317,6 @@ VScode, you'd have to add the following to the VSCode workspace settings of the ```json { - "clangd.path": "/mkosi.clangd", + "clangd.path": "/mkosi/mkosi.clangd", } ``` diff --git a/docs/TESTING_WITH_SANITIZERS.md b/docs/TESTING_WITH_SANITIZERS.md index 9b5b0896c0d..0b4e7265400 100644 --- a/docs/TESTING_WITH_SANITIZERS.md +++ b/docs/TESTING_WITH_SANITIZERS.md @@ -15,7 +15,7 @@ compiler you want to use and which part of the test suite you want to run. ## mkosi -To build with sanitizers in mkosi, create a file `mkosi.local.conf` and add the following contents: +To build with sanitizers in mkosi, create a file `mkosi/mkosi.local.conf` and add the following contents: ``` [Content] diff --git a/mkosi.clangd b/mkosi/mkosi.clangd similarity index 99% rename from mkosi.clangd rename to mkosi/mkosi.clangd index 7bbc67626fe..44c1128a91e 100755 --- a/mkosi.clangd +++ b/mkosi/mkosi.clangd @@ -22,4 +22,3 @@ exec "${SPAWN[@]}" mkosi \ $(pwd)=/work/src,\ $BUILDDIR/$BUILDSUBDIR=/work/build"\ "$@" - diff --git a/mkosi.clean b/mkosi/mkosi.clean similarity index 100% rename from mkosi.clean rename to mkosi/mkosi.clean diff --git a/mkosi.conf b/mkosi/mkosi.conf similarity index 89% rename from mkosi.conf rename to mkosi/mkosi.conf index 8c3695bef24..f4b556a0d7b 100644 --- a/mkosi.conf +++ b/mkosi/mkosi.conf @@ -26,23 +26,27 @@ PassEnvironment= [Output] RepartDirectories=mkosi.repart -OutputDirectory=build/mkosi.output +OutputDirectory=../build/mkosi.output [Build] History=yes ToolsTree=default -BuildDirectory=build/mkosi.builddir -CacheDirectory=build/mkosi.cache +BuildDirectory=../build/mkosi.builddir +CacheDirectory=../build/mkosi.cache Incremental=yes WithTests=no [Validation] SignExpectedPcr=yes +SignExpectedPcrKey=../mkosi.key +SignExpectedPcrCertificate=../mkosi.crt +VerityKey=../mkosi.key +VerityCertificate=../mkosi.crt [Content] ExtraTrees= mkosi.extra.common - mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key + ../mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key %O/minimal-0.root-%a.raw:/usr/share/minimal_0.raw %O/minimal-0.root-%a-verity.raw:/usr/share/minimal_0.verity %O/minimal-0.root-%a-verity-sig.raw:/usr/share/minimal_0.verity.sig @@ -148,5 +152,5 @@ VSock=yes KVM=yes [Include] -Include=%D/mkosi.sanitizers - %D/mkosi.coverage +Include=%D/mkosi/mkosi.sanitizers + %D/mkosi/mkosi.coverage diff --git a/mkosi.conf.d/arch/mkosi.conf b/mkosi/mkosi.conf.d/arch/mkosi.conf similarity index 100% rename from mkosi.conf.d/arch/mkosi.conf rename to mkosi/mkosi.conf.d/arch/mkosi.conf diff --git a/mkosi.conf.d/arch/mkosi.conf.d/debug.conf b/mkosi/mkosi.conf.d/arch/mkosi.conf.d/debug.conf similarity index 100% rename from mkosi.conf.d/arch/mkosi.conf.d/debug.conf rename to mkosi/mkosi.conf.d/arch/mkosi.conf.d/debug.conf diff --git a/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf similarity index 100% rename from mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf rename to mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf diff --git a/mkosi.conf.d/arch/mkosi.prepare b/mkosi/mkosi.conf.d/arch/mkosi.prepare similarity index 100% rename from mkosi.conf.d/arch/mkosi.prepare rename to mkosi/mkosi.conf.d/arch/mkosi.prepare diff --git a/mkosi.conf.d/build.conf b/mkosi/mkosi.conf.d/build.conf similarity index 100% rename from mkosi.conf.d/build.conf rename to mkosi/mkosi.conf.d/build.conf diff --git a/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf similarity index 100% rename from mkosi.conf.d/centos-fedora/mkosi.conf rename to mkosi/mkosi.conf.d/centos-fedora/mkosi.conf diff --git a/mkosi.conf.d/centos-fedora/mkosi.conf.d/debug.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/debug.conf similarity index 100% rename from mkosi.conf.d/centos-fedora/mkosi.conf.d/debug.conf rename to mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/debug.conf diff --git a/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf similarity index 100% rename from mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf rename to mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf diff --git a/mkosi.conf.d/centos-fedora/mkosi.conf.d/selinux.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/selinux.conf similarity index 100% rename from mkosi.conf.d/centos-fedora/mkosi.conf.d/selinux.conf rename to mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/selinux.conf diff --git a/mkosi.conf.d/centos-fedora/mkosi.prepare b/mkosi/mkosi.conf.d/centos-fedora/mkosi.prepare similarity index 100% rename from mkosi.conf.d/centos-fedora/mkosi.prepare rename to mkosi/mkosi.conf.d/centos-fedora/mkosi.prepare diff --git a/mkosi.conf.d/centos/mkosi.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf similarity index 100% rename from mkosi.conf.d/centos/mkosi.conf rename to mkosi/mkosi.conf.d/centos/mkosi.conf diff --git a/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf similarity index 100% rename from mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf rename to mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf diff --git a/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf similarity index 100% rename from mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf rename to mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf diff --git a/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf similarity index 100% rename from mkosi.conf.d/debian-ubuntu/mkosi.conf rename to mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf diff --git a/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf similarity index 100% rename from mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf rename to mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf diff --git a/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf similarity index 100% rename from mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf rename to mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf diff --git a/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/network.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/network.conf similarity index 100% rename from mkosi.conf.d/debian-ubuntu/mkosi.conf.d/network.conf rename to mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/network.conf diff --git a/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf similarity index 100% rename from mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf rename to mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf diff --git a/mkosi.conf.d/debian-ubuntu/mkosi.prepare b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.prepare similarity index 100% rename from mkosi.conf.d/debian-ubuntu/mkosi.prepare rename to mkosi/mkosi.conf.d/debian-ubuntu/mkosi.prepare diff --git a/mkosi.conf.d/debian/mkosi.conf b/mkosi/mkosi.conf.d/debian/mkosi.conf similarity index 100% rename from mkosi.conf.d/debian/mkosi.conf rename to mkosi/mkosi.conf.d/debian/mkosi.conf diff --git a/mkosi.conf.d/debian/mkosi.conf.d/arm64.conf b/mkosi/mkosi.conf.d/debian/mkosi.conf.d/arm64.conf similarity index 100% rename from mkosi.conf.d/debian/mkosi.conf.d/arm64.conf rename to mkosi/mkosi.conf.d/debian/mkosi.conf.d/arm64.conf diff --git a/mkosi.conf.d/debian/mkosi.conf.d/x86-64.conf b/mkosi/mkosi.conf.d/debian/mkosi.conf.d/x86-64.conf similarity index 100% rename from mkosi.conf.d/debian/mkosi.conf.d/x86-64.conf rename to mkosi/mkosi.conf.d/debian/mkosi.conf.d/x86-64.conf diff --git a/mkosi.conf.d/extra-search-path.conf b/mkosi/mkosi.conf.d/extra-search-path.conf similarity index 100% rename from mkosi.conf.d/extra-search-path.conf rename to mkosi/mkosi.conf.d/extra-search-path.conf diff --git a/mkosi.conf.d/fedora/mkosi.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf similarity index 100% rename from mkosi.conf.d/fedora/mkosi.conf rename to mkosi/mkosi.conf.d/fedora/mkosi.conf diff --git a/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf similarity index 100% rename from mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf rename to mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf diff --git a/mkosi.conf.d/none.conf b/mkosi/mkosi.conf.d/none.conf similarity index 100% rename from mkosi.conf.d/none.conf rename to mkosi/mkosi.conf.d/none.conf diff --git a/mkosi.conf.d/opensuse/macros.db_backend b/mkosi/mkosi.conf.d/opensuse/macros.db_backend similarity index 100% rename from mkosi.conf.d/opensuse/macros.db_backend rename to mkosi/mkosi.conf.d/opensuse/macros.db_backend diff --git a/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf similarity index 100% rename from mkosi.conf.d/opensuse/mkosi.conf rename to mkosi/mkosi.conf.d/opensuse/mkosi.conf diff --git a/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf similarity index 100% rename from mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf rename to mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf diff --git a/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf similarity index 100% rename from mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf rename to mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf diff --git a/mkosi.conf.d/opensuse/mkosi.prepare b/mkosi/mkosi.conf.d/opensuse/mkosi.prepare similarity index 100% rename from mkosi.conf.d/opensuse/mkosi.prepare rename to mkosi/mkosi.conf.d/opensuse/mkosi.prepare diff --git a/mkosi.conf.d/ubuntu/mkosi.conf b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf similarity index 100% rename from mkosi.conf.d/ubuntu/mkosi.conf rename to mkosi/mkosi.conf.d/ubuntu/mkosi.conf diff --git a/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf similarity index 58% rename from mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf rename to mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf index 255358967c8..eb0e8b80ad0 100644 --- a/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf +++ b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf @@ -7,4 +7,4 @@ Architecture=!x86 Release=noble [Build] -SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources +SandboxTrees=%D/mkosi/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources diff --git a/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf similarity index 60% rename from mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf rename to mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf index 5463bd794a2..f6556dd4071 100644 --- a/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf +++ b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf @@ -7,4 +7,4 @@ Architecture=|x86 Release=noble [Build] -SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources +SandboxTrees=%D/mkosi/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources diff --git a/mkosi.conf.d/ubuntu/noble-backports-ports.sources b/mkosi/mkosi.conf.d/ubuntu/noble-backports-ports.sources similarity index 100% rename from mkosi.conf.d/ubuntu/noble-backports-ports.sources rename to mkosi/mkosi.conf.d/ubuntu/noble-backports-ports.sources diff --git a/mkosi.conf.d/ubuntu/noble-backports.sources b/mkosi/mkosi.conf.d/ubuntu/noble-backports.sources similarity index 100% rename from mkosi.conf.d/ubuntu/noble-backports.sources rename to mkosi/mkosi.conf.d/ubuntu/noble-backports.sources diff --git a/mkosi.coverage/mkosi.conf b/mkosi/mkosi.coverage/mkosi.conf similarity index 100% rename from mkosi.coverage/mkosi.conf rename to mkosi/mkosi.coverage/mkosi.conf diff --git a/mkosi.coverage/mkosi.postinst b/mkosi/mkosi.coverage/mkosi.postinst similarity index 100% rename from mkosi.coverage/mkosi.postinst rename to mkosi/mkosi.coverage/mkosi.postinst diff --git a/mkosi.credentials/userdb.group.testuser b/mkosi/mkosi.credentials/userdb.group.testuser similarity index 100% rename from mkosi.credentials/userdb.group.testuser rename to mkosi/mkosi.credentials/userdb.group.testuser diff --git a/mkosi.credentials/userdb.user.testuser b/mkosi/mkosi.credentials/userdb.user.testuser similarity index 100% rename from mkosi.credentials/userdb.user.testuser rename to mkosi/mkosi.credentials/userdb.user.testuser diff --git a/mkosi.extra.common/etc/issue b/mkosi/mkosi.extra.common/etc/issue similarity index 98% rename from mkosi.extra.common/etc/issue rename to mkosi/mkosi.extra.common/etc/issue index eb97dd17f46..6aa6fc0ec06 100644 --- a/mkosi.extra.common/etc/issue +++ b/mkosi/mkosi.extra.common/etc/issue @@ -1,3 +1,2 @@ \S (built from systemd tree) Kernel \r on an \m (\l) - diff --git a/mkosi.extra.common/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf b/mkosi/mkosi.extra.common/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf similarity index 100% rename from mkosi.extra.common/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf rename to mkosi/mkosi.extra.common/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf diff --git a/mkosi.extra.common/usr/lib/systemd/coverage-forwarder b/mkosi/mkosi.extra.common/usr/lib/systemd/coverage-forwarder similarity index 100% rename from mkosi.extra.common/usr/lib/systemd/coverage-forwarder rename to mkosi/mkosi.extra.common/usr/lib/systemd/coverage-forwarder diff --git a/mkosi.extra.common/usr/lib/systemd/journald.conf.d/ratelimit.conf b/mkosi/mkosi.extra.common/usr/lib/systemd/journald.conf.d/ratelimit.conf similarity index 100% rename from mkosi.extra.common/usr/lib/systemd/journald.conf.d/ratelimit.conf rename to mkosi/mkosi.extra.common/usr/lib/systemd/journald.conf.d/ratelimit.conf diff --git a/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset b/mkosi/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset similarity index 100% rename from mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset rename to mkosi/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset diff --git a/mkosi.extra.common/usr/lib/systemd/system-preset/99-mkosi.preset b/mkosi/mkosi.extra.common/usr/lib/systemd/system-preset/99-mkosi.preset similarity index 100% rename from mkosi.extra.common/usr/lib/systemd/system-preset/99-mkosi.preset rename to mkosi/mkosi.extra.common/usr/lib/systemd/system-preset/99-mkosi.preset diff --git a/mkosi.extra.common/usr/lib/systemd/system/coverage-forwarder.service b/mkosi/mkosi.extra.common/usr/lib/systemd/system/coverage-forwarder.service similarity index 100% rename from mkosi.extra.common/usr/lib/systemd/system/coverage-forwarder.service rename to mkosi/mkosi.extra.common/usr/lib/systemd/system/coverage-forwarder.service diff --git a/mkosi.extra/etc/iscsi/iscsid.conf b/mkosi/mkosi.extra/etc/iscsi/iscsid.conf similarity index 100% rename from mkosi.extra/etc/iscsi/iscsid.conf rename to mkosi/mkosi.extra/etc/iscsi/iscsid.conf diff --git a/mkosi.extra/root/.gdbinit b/mkosi/mkosi.extra/root/.gdbinit similarity index 100% rename from mkosi.extra/root/.gdbinit rename to mkosi/mkosi.extra/root/.gdbinit diff --git a/mkosi.extra/usr/lib/sysctl.d/99-apparmor-unpriv-userns.conf b/mkosi/mkosi.extra/usr/lib/sysctl.d/99-apparmor-unpriv-userns.conf similarity index 100% rename from mkosi.extra/usr/lib/sysctl.d/99-apparmor-unpriv-userns.conf rename to mkosi/mkosi.extra/usr/lib/sysctl.d/99-apparmor-unpriv-userns.conf diff --git a/mkosi.extra/usr/lib/systemd/system/user@.service.d/99-SYSTEMD_UNIT_PATH.conf b/mkosi/mkosi.extra/usr/lib/systemd/system/user@.service.d/99-SYSTEMD_UNIT_PATH.conf similarity index 100% rename from mkosi.extra/usr/lib/systemd/system/user@.service.d/99-SYSTEMD_UNIT_PATH.conf rename to mkosi/mkosi.extra/usr/lib/systemd/system/user@.service.d/99-SYSTEMD_UNIT_PATH.conf diff --git a/mkosi.extra/usr/lib/tmpfiles.d/snapshot.conf b/mkosi/mkosi.extra/usr/lib/tmpfiles.d/snapshot.conf similarity index 100% rename from mkosi.extra/usr/lib/tmpfiles.d/snapshot.conf rename to mkosi/mkosi.extra/usr/lib/tmpfiles.d/snapshot.conf diff --git a/mkosi.extra/usr/share/dbus-1/system.d/systemd.test.ExecStopPost.conf b/mkosi/mkosi.extra/usr/share/dbus-1/system.d/systemd.test.ExecStopPost.conf similarity index 100% rename from mkosi.extra/usr/share/dbus-1/system.d/systemd.test.ExecStopPost.conf rename to mkosi/mkosi.extra/usr/share/dbus-1/system.d/systemd.test.ExecStopPost.conf diff --git a/mkosi.finalize b/mkosi/mkosi.finalize similarity index 100% rename from mkosi.finalize rename to mkosi/mkosi.finalize diff --git a/mkosi.functions b/mkosi/mkosi.functions similarity index 100% rename from mkosi.functions rename to mkosi/mkosi.functions diff --git a/mkosi.images/build/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.build.chroot similarity index 100% rename from mkosi.images/build/mkosi.build.chroot rename to mkosi/mkosi.images/build/mkosi.build.chroot diff --git a/mkosi.images/build/mkosi.conf b/mkosi/mkosi.images/build/mkosi.conf similarity index 100% rename from mkosi.images/build/mkosi.conf rename to mkosi/mkosi.images/build/mkosi.conf diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot similarity index 100% rename from mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot rename to mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf similarity index 75% rename from mkosi.images/build/mkosi.conf.d/arch/mkosi.conf rename to mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf index 2e54455354c..9809fbc2522 100644 --- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf +++ b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf @@ -4,7 +4,7 @@ Distribution=arch [Include] -Include=%D/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf +Include=%D/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf [Content] Packages= diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare similarity index 100% rename from mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare rename to mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot similarity index 99% rename from mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot rename to mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot index ee50071869e..1d617cb7ce0 100755 --- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot +++ b/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot @@ -2,7 +2,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later set -e -. mkosi.functions +. mkosi/mkosi.functions if [[ "$1" == "clangd" ]]; then exit 0 diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf similarity index 79% rename from mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf rename to mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf index 89fdfc4b20a..438c0ab4ef8 100644 --- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf +++ b/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf @@ -5,7 +5,7 @@ Distribution=|centos Distribution=|fedora [Include] -Include=%D/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf +Include=%D/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf [Content] Packages= diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare b/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare similarity index 100% rename from mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare rename to mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare diff --git a/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf b/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf similarity index 100% rename from mkosi.images/build/mkosi.conf.d/centos/mkosi.conf rename to mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf diff --git a/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf b/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf similarity index 100% rename from mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf rename to mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot similarity index 100% rename from mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot rename to mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf similarity index 77% rename from mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf rename to mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf index 7fac74772b9..ee71965f297 100644 --- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf +++ b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf @@ -5,7 +5,7 @@ Distribution=|debian Distribution=|ubuntu [Include] -Include=%D/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf +Include=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf [Content] Packages= diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare similarity index 100% rename from mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare rename to mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare diff --git a/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf b/mkosi/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf similarity index 100% rename from mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf rename to mkosi/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot similarity index 99% rename from mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot rename to mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot index 2363b92ad5c..44ef675168c 100755 --- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot +++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot @@ -2,7 +2,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later set -e -. mkosi.functions +. mkosi/mkosi.functions if [[ "$1" == "clangd" ]]; then exit 0 diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf similarity index 82% rename from mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf rename to mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf index 00a45fce5b7..68ae1b33f06 100644 --- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf +++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf @@ -4,7 +4,7 @@ Distribution=opensuse [Include] -Include=%D/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf +Include=%D/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf [Content] Packages= diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare similarity index 100% rename from mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare rename to mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare diff --git a/mkosi.images/exitrd/mkosi.conf b/mkosi/mkosi.images/exitrd/mkosi.conf similarity index 85% rename from mkosi.images/exitrd/mkosi.conf rename to mkosi/mkosi.images/exitrd/mkosi.conf index ea4fc806bf3..f1e8e45dcd0 100644 --- a/mkosi.images/exitrd/mkosi.conf +++ b/mkosi/mkosi.images/exitrd/mkosi.conf @@ -14,4 +14,4 @@ Packages= bash [Include] -Include=%D/mkosi.sanitizers +Include=%D/mkosi/mkosi.sanitizers diff --git a/mkosi.images/exitrd/mkosi.conf.d/arch.conf b/mkosi/mkosi.images/exitrd/mkosi.conf.d/arch.conf similarity index 100% rename from mkosi.images/exitrd/mkosi.conf.d/arch.conf rename to mkosi/mkosi.images/exitrd/mkosi.conf.d/arch.conf diff --git a/mkosi.images/exitrd/mkosi.conf.d/build.conf b/mkosi/mkosi.images/exitrd/mkosi.conf.d/build.conf similarity index 100% rename from mkosi.images/exitrd/mkosi.conf.d/build.conf rename to mkosi/mkosi.images/exitrd/mkosi.conf.d/build.conf diff --git a/mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf similarity index 100% rename from mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf rename to mkosi/mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf diff --git a/mkosi.images/exitrd/mkosi.conf.d/debian.conf b/mkosi/mkosi.images/exitrd/mkosi.conf.d/debian.conf similarity index 100% rename from mkosi.images/exitrd/mkosi.conf.d/debian.conf rename to mkosi/mkosi.images/exitrd/mkosi.conf.d/debian.conf diff --git a/mkosi.images/exitrd/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.images/exitrd/mkosi.conf.d/opensuse.conf similarity index 100% rename from mkosi.images/exitrd/mkosi.conf.d/opensuse.conf rename to mkosi/mkosi.images/exitrd/mkosi.conf.d/opensuse.conf diff --git a/mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf b/mkosi/mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf similarity index 100% rename from mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf rename to mkosi/mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf diff --git a/mkosi.images/exitrd/mkosi.extra/shutdown b/mkosi/mkosi.images/exitrd/mkosi.extra/shutdown similarity index 100% rename from mkosi.images/exitrd/mkosi.extra/shutdown rename to mkosi/mkosi.images/exitrd/mkosi.extra/shutdown diff --git a/mkosi.images/initrd/mkosi.conf b/mkosi/mkosi.images/initrd/mkosi.conf similarity index 60% rename from mkosi.images/initrd/mkosi.conf rename to mkosi/mkosi.images/initrd/mkosi.conf index ac66dd933b4..bee0911fc9b 100644 --- a/mkosi.images/initrd/mkosi.conf +++ b/mkosi/mkosi.images/initrd/mkosi.conf @@ -3,11 +3,11 @@ [Include] Include= mkosi-initrd - %D/mkosi.sanitizers - %D/mkosi.coverage + %D/mkosi/mkosi.sanitizers + %D/mkosi/mkosi.coverage [Content] -ExtraTrees=%D/mkosi.extra.common +ExtraTrees=%D/mkosi/mkosi.extra.common Packages= findutils diff --git a/mkosi.images/initrd/mkosi.conf.d/arch.conf b/mkosi/mkosi.images/initrd/mkosi.conf.d/arch.conf similarity index 100% rename from mkosi.images/initrd/mkosi.conf.d/arch.conf rename to mkosi/mkosi.images/initrd/mkosi.conf.d/arch.conf diff --git a/mkosi.images/initrd/mkosi.conf.d/build.conf b/mkosi/mkosi.images/initrd/mkosi.conf.d/build.conf similarity index 100% rename from mkosi.images/initrd/mkosi.conf.d/build.conf rename to mkosi/mkosi.images/initrd/mkosi.conf.d/build.conf diff --git a/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf similarity index 100% rename from mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf rename to mkosi/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf diff --git a/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf similarity index 100% rename from mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf rename to mkosi/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf diff --git a/mkosi.images/initrd/mkosi.conf.d/fedora.conf b/mkosi/mkosi.images/initrd/mkosi.conf.d/fedora.conf similarity index 100% rename from mkosi.images/initrd/mkosi.conf.d/fedora.conf rename to mkosi/mkosi.images/initrd/mkosi.conf.d/fedora.conf diff --git a/mkosi.images/initrd/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.images/initrd/mkosi.conf.d/opensuse.conf similarity index 100% rename from mkosi.images/initrd/mkosi.conf.d/opensuse.conf rename to mkosi/mkosi.images/initrd/mkosi.conf.d/opensuse.conf diff --git a/mkosi.images/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf b/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf similarity index 100% rename from mkosi.images/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf rename to mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf diff --git a/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service b/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service similarity index 100% rename from mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service rename to mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service diff --git a/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service b/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service similarity index 100% rename from mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service rename to mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service diff --git a/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service b/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service similarity index 100% rename from mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service rename to mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service diff --git a/mkosi.images/minimal-0/mkosi.conf b/mkosi/mkosi.images/minimal-0/mkosi.conf similarity index 100% rename from mkosi.images/minimal-0/mkosi.conf rename to mkosi/mkosi.images/minimal-0/mkosi.conf diff --git a/mkosi.images/minimal-0/mkosi.extra/opt/some_file b/mkosi/mkosi.images/minimal-0/mkosi.extra/opt/some_file similarity index 100% rename from mkosi.images/minimal-0/mkosi.extra/opt/some_file rename to mkosi/mkosi.images/minimal-0/mkosi.extra/opt/some_file diff --git a/mkosi.images/minimal-0/mkosi.extra/usr/lib/systemd/system/minimal-app0.service b/mkosi/mkosi.images/minimal-0/mkosi.extra/usr/lib/systemd/system/minimal-app0.service similarity index 100% rename from mkosi.images/minimal-0/mkosi.extra/usr/lib/systemd/system/minimal-app0.service rename to mkosi/mkosi.images/minimal-0/mkosi.extra/usr/lib/systemd/system/minimal-app0.service diff --git a/mkosi.images/minimal-0/mkosi.postinst b/mkosi/mkosi.images/minimal-0/mkosi.postinst similarity index 100% rename from mkosi.images/minimal-0/mkosi.postinst rename to mkosi/mkosi.images/minimal-0/mkosi.postinst diff --git a/mkosi.images/minimal-1/mkosi.conf b/mkosi/mkosi.images/minimal-1/mkosi.conf similarity index 100% rename from mkosi.images/minimal-1/mkosi.conf rename to mkosi/mkosi.images/minimal-1/mkosi.conf diff --git a/mkosi.images/minimal-1/mkosi.extra/opt/some_file b/mkosi/mkosi.images/minimal-1/mkosi.extra/opt/some_file similarity index 100% rename from mkosi.images/minimal-1/mkosi.extra/opt/some_file rename to mkosi/mkosi.images/minimal-1/mkosi.extra/opt/some_file diff --git a/mkosi.images/minimal-1/mkosi.extra/usr/lib/systemd/system/minimal-app0.service b/mkosi/mkosi.images/minimal-1/mkosi.extra/usr/lib/systemd/system/minimal-app0.service similarity index 100% rename from mkosi.images/minimal-1/mkosi.extra/usr/lib/systemd/system/minimal-app0.service rename to mkosi/mkosi.images/minimal-1/mkosi.extra/usr/lib/systemd/system/minimal-app0.service diff --git a/mkosi.images/minimal-1/mkosi.postinst b/mkosi/mkosi.images/minimal-1/mkosi.postinst similarity index 100% rename from mkosi.images/minimal-1/mkosi.postinst rename to mkosi/mkosi.images/minimal-1/mkosi.postinst diff --git a/mkosi.images/minimal-base/mkosi.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf similarity index 87% rename from mkosi.images/minimal-base/mkosi.conf rename to mkosi/mkosi.images/minimal-base/mkosi.conf index 56040f8b21e..b51ac638d6f 100644 --- a/mkosi.images/minimal-base/mkosi.conf +++ b/mkosi/mkosi.images/minimal-base/mkosi.conf @@ -16,4 +16,4 @@ Packages= util-linux [Include] -Include=%D/mkosi.sanitizers +Include=%D/mkosi/mkosi.sanitizers diff --git a/mkosi.images/minimal-base/mkosi.conf.d/arch.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf similarity index 100% rename from mkosi.images/minimal-base/mkosi.conf.d/arch.conf rename to mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf diff --git a/mkosi.images/minimal-base/mkosi.conf.d/build.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/build.conf similarity index 100% rename from mkosi.images/minimal-base/mkosi.conf.d/build.conf rename to mkosi/mkosi.images/minimal-base/mkosi.conf.d/build.conf diff --git a/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf similarity index 100% rename from mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf rename to mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf diff --git a/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf similarity index 100% rename from mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf rename to mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf diff --git a/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf similarity index 100% rename from mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf rename to mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf diff --git a/mkosi.images/minimal-base/mkosi.extra/etc/os-release b/mkosi/mkosi.images/minimal-base/mkosi.extra/etc/os-release similarity index 100% rename from mkosi.images/minimal-base/mkosi.extra/etc/os-release rename to mkosi/mkosi.images/minimal-base/mkosi.extra/etc/os-release diff --git a/mkosi.images/minimal-base/mkosi.extra/etc/resolv.conf b/mkosi/mkosi.images/minimal-base/mkosi.extra/etc/resolv.conf similarity index 100% rename from mkosi.images/minimal-base/mkosi.extra/etc/resolv.conf rename to mkosi/mkosi.images/minimal-base/mkosi.extra/etc/resolv.conf diff --git a/mkosi.images/minimal-base/mkosi.postinst b/mkosi/mkosi.images/minimal-base/mkosi.postinst similarity index 100% rename from mkosi.images/minimal-base/mkosi.postinst rename to mkosi/mkosi.images/minimal-base/mkosi.postinst diff --git a/mkosi.postinst.chroot b/mkosi/mkosi.postinst.chroot similarity index 100% rename from mkosi.postinst.chroot rename to mkosi/mkosi.postinst.chroot diff --git a/mkosi.repart/00-esp.conf b/mkosi/mkosi.repart/00-esp.conf similarity index 100% rename from mkosi.repart/00-esp.conf rename to mkosi/mkosi.repart/00-esp.conf diff --git a/mkosi.repart/10-root.conf b/mkosi/mkosi.repart/10-root.conf similarity index 100% rename from mkosi.repart/10-root.conf rename to mkosi/mkosi.repart/10-root.conf diff --git a/mkosi.sanitizers/mkosi.conf b/mkosi/mkosi.sanitizers/mkosi.conf similarity index 100% rename from mkosi.sanitizers/mkosi.conf rename to mkosi/mkosi.sanitizers/mkosi.conf diff --git a/mkosi.sanitizers/mkosi.conf.d/arch.conf b/mkosi/mkosi.sanitizers/mkosi.conf.d/arch.conf similarity index 100% rename from mkosi.sanitizers/mkosi.conf.d/arch.conf rename to mkosi/mkosi.sanitizers/mkosi.conf.d/arch.conf diff --git a/mkosi.sanitizers/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.sanitizers/mkosi.conf.d/debian-ubuntu.conf similarity index 100% rename from mkosi.sanitizers/mkosi.conf.d/debian-ubuntu.conf rename to mkosi/mkosi.sanitizers/mkosi.conf.d/debian-ubuntu.conf diff --git a/mkosi.sanitizers/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.sanitizers/mkosi.conf.d/opensuse.conf similarity index 100% rename from mkosi.sanitizers/mkosi.conf.d/opensuse.conf rename to mkosi/mkosi.sanitizers/mkosi.conf.d/opensuse.conf diff --git a/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/leak-sanitizer-suppressions b/mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/leak-sanitizer-suppressions similarity index 100% rename from mkosi.sanitizers/mkosi.extra/usr/lib/systemd/leak-sanitizer-suppressions rename to mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/leak-sanitizer-suppressions diff --git a/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system.conf.d/10-sanitizers.conf b/mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system.conf.d/10-sanitizers.conf similarity index 100% rename from mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system.conf.d/10-sanitizers.conf rename to mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system.conf.d/10-sanitizers.conf diff --git a/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/10-asan.conf b/mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/10-asan.conf similarity index 100% rename from mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/10-asan.conf rename to mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/10-asan.conf diff --git a/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/service.d/10-timeout-abort.conf b/mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/service.d/10-timeout-abort.conf similarity index 100% rename from mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/service.d/10-timeout-abort.conf rename to mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/service.d/10-timeout-abort.conf diff --git a/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/systemd-coredump@.service.d/10-asan.conf b/mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/systemd-coredump@.service.d/10-asan.conf similarity index 100% rename from mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/systemd-coredump@.service.d/10-asan.conf rename to mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/systemd-coredump@.service.d/10-asan.conf diff --git a/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/systemd-journald.service.d/10-stdout-tty.conf b/mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/systemd-journald.service.d/10-stdout-tty.conf similarity index 100% rename from mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/systemd-journald.service.d/10-stdout-tty.conf rename to mkosi/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/systemd-journald.service.d/10-stdout-tty.conf diff --git a/mkosi.sanitizers/mkosi.postinst b/mkosi/mkosi.sanitizers/mkosi.postinst similarity index 100% rename from mkosi.sanitizers/mkosi.postinst rename to mkosi/mkosi.sanitizers/mkosi.postinst diff --git a/mkosi.sync b/mkosi/mkosi.sync similarity index 100% rename from mkosi.sync rename to mkosi/mkosi.sync diff --git a/mkosi.tools.conf/mkosi.conf b/mkosi/mkosi.tools.conf/mkosi.conf similarity index 83% rename from mkosi.tools.conf/mkosi.conf rename to mkosi/mkosi.tools.conf/mkosi.conf index a83e07a13e6..6be11eb6af1 100644 --- a/mkosi.tools.conf/mkosi.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Content] -SyncScripts=%D/mkosi.sync +SyncScripts=%D/mkosi/mkosi.sync Packages= gdb llvm diff --git a/mkosi.tools.conf/mkosi.conf.d/arch.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf similarity index 59% rename from mkosi.tools.conf/mkosi.conf.d/arch.conf rename to mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf index 75570ffe0c6..20e7abc14aa 100644 --- a/mkosi.tools.conf/mkosi.conf.d/arch.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf @@ -4,10 +4,10 @@ Distribution=arch [Include] -Include=%D/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf +Include=%D/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf [Content] -PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare +PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare Packages= base-devel github-cli diff --git a/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf similarity index 52% rename from mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf rename to mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf index 8f5f07addf5..268539f1ffa 100644 --- a/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf @@ -5,10 +5,10 @@ Distribution=|fedora Distribution=|centos [Include] -Include=%D/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf +Include=%D/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf [Content] -PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare +PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare Packages= python3-mypy rpm-build diff --git a/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf similarity index 54% rename from mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf rename to mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf index 0a34b867c9b..6bbfab78d61 100644 --- a/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf @@ -5,10 +5,10 @@ Distribution=|debian Distribution=|ubuntu [Include] -Include=%D/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf +Include=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf [Content] -PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare +PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare Packages= gh lcov diff --git a/mkosi.tools.conf/mkosi.conf.d/fedora.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf similarity index 100% rename from mkosi.tools.conf/mkosi.conf.d/fedora.conf rename to mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf diff --git a/mkosi.tools.conf/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf similarity index 58% rename from mkosi.tools.conf/mkosi.conf.d/opensuse.conf rename to mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf index 6fd1c746d60..77d54130f7b 100644 --- a/mkosi.tools.conf/mkosi.conf.d/opensuse.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf @@ -4,10 +4,10 @@ Distribution=opensuse [Include] -Include=%D/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf +Include=%D/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf [Content] -PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare +PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare Packages= gh lcov diff --git a/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf similarity index 100% rename from mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf rename to mkosi/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf diff --git a/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf similarity index 58% rename from mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf rename to mkosi/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf index 255358967c8..eb0e8b80ad0 100644 --- a/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf @@ -7,4 +7,4 @@ Architecture=!x86 Release=noble [Build] -SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources +SandboxTrees=%D/mkosi/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources diff --git a/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf similarity index 60% rename from mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf rename to mkosi/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf index 5463bd794a2..f6556dd4071 100644 --- a/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf @@ -7,4 +7,4 @@ Architecture=|x86 Release=noble [Build] -SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources +SandboxTrees=%D/mkosi/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources diff --git a/mkosi.uki-profiles/profile1.conf b/mkosi/mkosi.uki-profiles/profile1.conf similarity index 100% rename from mkosi.uki-profiles/profile1.conf rename to mkosi/mkosi.uki-profiles/profile1.conf diff --git a/mkosi.uki-profiles/profile2.conf b/mkosi/mkosi.uki-profiles/profile2.conf similarity index 100% rename from mkosi.uki-profiles/profile2.conf rename to mkosi/mkosi.uki-profiles/profile2.conf diff --git a/test/integration-tests/README.md b/test/integration-tests/README.md index 1314bf01310..7aebc89201b 100644 --- a/test/integration-tests/README.md +++ b/test/integration-tests/README.md @@ -33,7 +33,7 @@ $ mkosi -f Note that by default we assume that `build/` is used as the meson build directory that will be used to run the integration tests. If you want to use another directory as the meson build directory, you will have to configure the mkosi build directory (`BuildDirectory=`), cache directory (`CacheDirectory=`) and output -directory (`OutputDirectory=`) to point to the other directory using `mkosi.local.conf`. +directory (`OutputDirectory=`) to point to the other directory using `mkosi/mkosi.local.conf`. After the image has been built, the integration tests can be run with: @@ -69,7 +69,7 @@ $ mkosi -f sandbox -- meson compile -C build mkosi && env SYSTEMD_INTEGRATION_TE The integration tests use the same mkosi configuration that's used when you run mkosi in the systemd reposistory, so any local modifications to the mkosi -configuration (e.g. in `mkosi.local.conf`) are automatically picked up and used +configuration (e.g. in `mkosi/mkosi.local.conf`) are automatically picked up and used by the integration tests as well. ## Iterating on an integration test @@ -144,7 +144,7 @@ progress and only move the journal to its final location in the build directory ## Running the integration tests without building systemd from source If you want to run the integration tests against prebuilt systemd packages, -first add the following to `mkosi.local.conf` to stop mkosi from building +first add the following to `mkosi/mkosi.local.conf` to stop mkosi from building systemd packages from source: ```conf @@ -160,7 +160,7 @@ should be installed. If the rpms are installed on the host system that the tests are running on, you'll probably want to disable usage of the tools tree so that the tools from the host system are used to build the image by adding the following to -`mkosi.local.conf`: +`mkosi/mkosi.local.conf`: ```conf [Build] @@ -171,7 +171,7 @@ On the other hand, if the rpms are available but not installed on the host system, you'll want to make sure they're installed into the mkosi tools tree so that they're used to build the image by again using either `PackageDirectories=` or `SandboxTrees=`, but this time in -`mkosi.tools.conf/mkosi.local.conf` instead of `mkosi.local.conf`. +`mkosi/mkosi.tools.conf/mkosi.local.conf` instead of `mkosi/mkosi.local.conf`. Finally, we'll make use of the standalone mode of running the integration tests to avoid having to install any build dependencies. @@ -185,7 +185,7 @@ $ mkosi sandbox -- meson test -C testsuite --num-processes "$(($(nproc) / 4))" ### SELinux AVCs To have `TEST-06-SELINUX` check for SELinux denials, write the following to -mkosi.local.conf: +`mkosi/mkosi.local.conf`: ```conf [Runtime] diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py index c7d30f18c13..fce9decd82d 100755 --- a/tools/fetch-distro.py +++ b/tools/fetch-distro.py @@ -126,7 +126,7 @@ def update_distro(args, distro: str, config: dict): print(f"+ {shlex.join(cmd)}") changes = subprocess.check_output(cmd, text=True).strip() - conf_dir = Path('mkosi.conf.d') + conf_dir = Path('mkosi/mkosi.conf.d') files = conf_dir.glob('**/pkgenv.conf') for file in files: s = file.read_text()