mkosi: Use build image prepare scripts for tools tree as well

Instead of listing dependencies manually for the default tools tree, let's reuse the prepare scripts from the build image. To make this work, the sync script has to be configured for the tools tree as well so that it's invoked both when building the tools tree and for the regular image, otherwise, when doing the first build in a fresh checkout, the sync script won't have executed yet as sync scripts for the regular images are executed after building the default tools tree.
2026-04-14 00:14:32 +09:00 · 2025-03-25 21:02:24 +01:00
parent e7df838a07
commit 1b49fb9aaa
26 changed files with 78 additions and 93 deletions
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -191,10 +191,14 @@ jobs:

      - name: Configure meson
        run: |
+          # /usr/sbin/bpftool is completely broken inside containers on Ubuntu which makes meson blow up so
+          # disable the bpf-framework stuff to avoid the issue.
+          # TODO: Drop when we move off Ubuntu Noble as this will be fixed in the next Ubuntu LTS release.
          sudo mkosi sandbox -- \
            meson setup \
            --buildtype=debugoptimized \
            -Dintegration-tests=true \
+            -Dbpf-framework=disabled \
            build

      - name: Build image
--- a/.packit.yml
+++ b/.packit.yml
@@ -19,7 +19,7 @@ actions:
  post-upstream-clone:
    # Use the Fedora Rawhide specfile
    - git clone https://src.fedoraproject.org/rpms/systemd .packit_rpm
-    - bash -c 'git -C .packit_rpm checkout "$(grep GIT_COMMIT= mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf | cut -d= -f2)"'
+    - bash -c 'git -C .packit_rpm checkout "$(grep GIT_COMMIT= mkosi.conf.d/10-centos-fedora/mkosi.conf | cut -d= -f2)"'
    - bash -c 'echo "%bcond upstream 1" > .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'
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@@ -39,7 +39,7 @@ chance that your distribution's packaged version of mkosi will be too old.
 Then, you can build, run and test systemd executables as follows:

 ```sh
-$ mkosi -f sandbox -- meson setup build
+$ mkosi -f sandbox -- meson setup -Dbpf-framework=disabled build # bpftool detection inside mkosi sandbox is broken on Ubuntu Noble and older
 $ mkosi -f sandbox -- meson compile -C build
 $ mkosi -f sandbox -- build/systemctl --version
 $ mkosi -f sandbox -- meson test -C build          # Run the unit tests
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -11,7 +11,6 @@ Dependencies=

 PassEnvironment=
        NO_BUILD
-        NO_SYNC
        WIPE
        SANITIZERS
        CFLAGS
@@ -24,6 +23,11 @@ PassEnvironment=
        ASAN_OPTIONS
        COVERAGE
        VCS_TAG
+        GIT_URL
+        GIT_SUBDIR
+        GIT_BRANCH
+        GIT_COMMIT
+        PKG_SUBDIR

 [Output]
 RepartDirectories=mkosi.repart
--- a/mkosi.conf.d/05-tools/mkosi.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf
@@ -1,11 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 [Build]
+ToolsTreeSyncScripts=%D/mkosi.sync
 ToolsTreePackages=
-        gcc
        gdb
-        gperf
        llvm
-        meson
-        pkgconf
-        rsync
+        meson # Also needed in the NO_BUILD case so we list it explicitly.
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf
@@ -4,19 +4,11 @@
 ToolsTreeDistribution=arch

 [Build]
+ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
 ToolsTreePackages=
-        cryptsetup
+        base-devel
        github-cli
        lcov
-        libcap
-        libmicrohttpd
-        libxslt
        mypy
-        perl-json-xs
-        python-jinja
-        python-lxml
-        python-pytest
        ruff
        shellcheck
-        tpm2-tss
-        util-linux-libs
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf
@@ -5,18 +5,7 @@ ToolsTreeDistribution=|fedora
 ToolsTreeDistribution=|centos

 [Build]
+ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
 ToolsTreePackages=
-        pkgconfig(blkid)
-        pkgconfig(libcap)
-        pkgconfig(libcryptsetup)
-        pkgconfig(libcurl)
-        pkgconfig(fdisk)
-        pkgconfig(libmicrohttpd)
-        pkgconfig(mount)
-        tpm2-tss-devel
-        python3-jinja2
-        python3-lxml
        python3-mypy
-        python3-pytest
-        libxslt
-        docbook-style-xsl
+        rpm-build
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf
@@ -5,20 +5,9 @@ ToolsTreeDistribution=|debian
 ToolsTreeDistribution=|ubuntu

 [Build]
+ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
 ToolsTreePackages=
        gh
        lcov
-        libblkid-dev
-        libcap-dev
-        libcryptsetup-dev
-        libcurl4-openssl-dev
-        libfdisk-dev
-        libmicrohttpd-dev
-        libmount-dev
-        libtss2-dev
        mypy
-        python3-jinja2
-        python3-lxml
-        python3-pytest
        shellcheck
-        xsltproc
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf
@@ -4,23 +4,11 @@
 ToolsTreeDistribution=opensuse

 [Build]
+ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
 ToolsTreePackages=
-        lcov
-        libz1
        gh
+        lcov
        mypy
-        pkgconfig(blkid)
-        pkgconfig(libcap)
-        pkgconfig(libcryptsetup)
-        pkgconfig(libcurl)
-        pkgconfig(fdisk)
-        pkgconfig(libmicrohttpd)
-        pkgconfig(mount)
-        pkgconfig(libopenssl)
        python3-ruff
-        tpm2-0-tss-devel
-        python3-jinja2
-        python3-lxml
-        python3-pytest
-        xsltproc
+        rpm-build
        ShellCheck
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+ToolsTreeDistribution=ubuntu
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# The ports Ubuntu archive is for non i386/amd64 repositories
+
+[Match]
+Architecture=!x86-64
+Architecture=!x86
+ToolsTreeRelease=noble
+
+[Build]
+ToolsTreeSandboxTrees=%D/mkosi.conf.d/10-ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
+++ b/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# The main Ubuntu archive is only for i386/amd64 repositories
+
+[Match]
+Architecture=|x86-64
+Architecture=|x86
+ToolsTreeRelease=noble
+
+[Build]
+ToolsTreeSandboxTrees=%D/mkosi.conf.d/10-ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
--- a/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.conf.d/10-arch/mkosi.conf
@@ -3,6 +3,13 @@
 [Match]
 Distribution=arch

+[Build]
+Environment=
+        GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
+        GIT_BRANCH=main
+        GIT_COMMIT=1b4994657df1c7495607f0c2f20db73550b94f34
+        PKG_SUBDIR=arch
+
 [Content]
 VolatilePackages=
        systemd
--- a/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -4,6 +4,13 @@
 Distribution=|centos
 Distribution=|fedora

+[Build]
+Environment=
+        GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
+        GIT_BRANCH=rawhide
+        GIT_COMMIT=617952132de4ed882b9b00ceeed077f843130f91
+        PKG_SUBDIR=fedora
+
 [Content]
 VolatilePackages=
        systemd
--- a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -4,6 +4,14 @@
 Distribution=|debian
 Distribution=|ubuntu

+[Build]
+Environment=
+        GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
+        GIT_SUBDIR=debian
+        GIT_BRANCH=debian/master
+        GIT_COMMIT=d8c7f8f7f461b1edc3bf5040509e697ea574c990
+        PKG_SUBDIR=debian
+
 [Content]
 VolatilePackages=
        libnss-myhostname
--- a/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -9,6 +9,12 @@ Repositories=non-oss

 [Build]
 SandboxTrees=macros.db_backend:/etc/rpm/macros.db_backend
+Environment=
+        GIT_URL=https://github.com/bmwiedemann/openSUSE
+        GIT_SUBDIR=packages/s/systemd
+        GIT_BRANCH=master
+        GIT_COMMIT=9002a773f0ab185908dc8fb6c831c1cd9fdf11f0
+        PKG_SUBDIR=opensuse

 [Content]
 VolatilePackages=
--- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
@@ -3,13 +3,6 @@
 [Match]
 Distribution=arch

-[Build]
-Environment=
-        GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
-        GIT_BRANCH=main
-        GIT_COMMIT=1b4994657df1c7495607f0c2f20db73550b94f34
-        PKG_SUBDIR=arch
-
 [Content]
 Packages=
        base
--- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
+++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e

-if [[ "$1" == "build" ]]; then
+if [[ "$1" == "build" ]] || ((NO_BUILD)); then
    exit 0
 fi

--- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -4,13 +4,6 @@
 Distribution=|centos
 Distribution=|fedora

-[Build]
-Environment=
-        GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
-        GIT_BRANCH=rawhide
-        GIT_COMMIT=617952132de4ed882b9b00ceeed077f843130f91
-        PKG_SUBDIR=fedora
-
 [Content]
 Packages=
        clang-devel
--- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
+++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e

-if [[ "$1" == "build" ]]; then
+if [[ "$1" == "build" ]] || ((NO_BUILD)); then
    exit 0
 fi

--- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
@@ -4,14 +4,6 @@
 Distribution=|debian
 Distribution=|ubuntu

-[Build]
-Environment=
-        GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
-        GIT_SUBDIR=debian
-        GIT_BRANCH=debian/master
-        GIT_COMMIT=d8c7f8f7f461b1edc3bf5040509e697ea574c990
-        PKG_SUBDIR=debian
-
 [Content]
 Packages=
        apt
--- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
+++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e

-if [[ "$1" == "build" ]]; then
+if [[ "$1" == "build" ]] || ((NO_BUILD)); then
    exit 0
 fi

--- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
@@ -3,14 +3,6 @@
 [Match]
 Distribution=opensuse

-[Build]
-Environment=
-        GIT_URL=https://github.com/bmwiedemann/openSUSE
-        GIT_SUBDIR=packages/s/systemd
-        GIT_BRANCH=master
-        GIT_COMMIT=9002a773f0ab185908dc8fb6c831c1cd9fdf11f0
-        PKG_SUBDIR=opensuse
-
 [Content]
 Packages=
        clang
--- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
+++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e

-if [[ "$1" == "build" ]]; then
+if [[ "$1" == "build" ]] || ((NO_BUILD)); then
    exit 0
 fi

--- a/mkosi.images/build/mkosi.sync
+++ b/mkosi.images/build/mkosi.sync
--- 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.images/build/mkosi.conf.d')
+    conf_dir = Path('mkosi.conf.d')
    files = conf_dir.glob('*/*.conf')
    for file in files:
        s = file.read_text()