From d980aee1e8e057b12fcbd20e8300248091d000d5 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sat, 2 Nov 2024 22:13:31 +0100 Subject: mkosi: Add extra tools tree packages required to run integration tests With https://github.com/systemd/mkosi/pull/3164, we'll be able to run arbitrary commands in the mkosi sandbox, which has /usr from the tools tree if one is configured. Let's add the required packages to be able to run meson to setup the integration tests. This allows running the integration tests without having to install meson or other build dependencies on the host system. """ mkosi sandbox meson setup build mkosi sandbox meson compile -C build mkosi mkosi sandbox env SYSTEMD_INTEGRATION_TESTS=1 meson test -C build ... """ --- mkosi.conf.d/05-tools/mkosi.conf | 8 ++++++++ mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf | 13 +++++++++++++ mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf | 17 +++++++++++++++++ mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf | 17 +++++++++++++++++ mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf | 16 ++++++++++++++++ 5 files changed, 71 insertions(+) create mode 100644 mkosi.conf.d/05-tools/mkosi.conf create mode 100644 mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf create mode 100644 mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf create mode 100644 mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf create mode 100644 mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf (limited to 'mkosi.conf.d') diff --git a/mkosi.conf.d/05-tools/mkosi.conf b/mkosi.conf.d/05-tools/mkosi.conf new file mode 100644 index 0000000000..6da7766dc1 --- /dev/null +++ b/mkosi.conf.d/05-tools/mkosi.conf @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Build] +ToolsTreePackages= + meson + gcc + gperf + pkgconf diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf new file mode 100644 index 0000000000..5188d04508 --- /dev/null +++ b/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +ToolsTreeDistribution=arch + +[Build] +ToolsTreePackages= + cryptsetup + libcap + libmicrohttpd + python-jinja + tpm2-tss + util-linux-libs diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf new file mode 100644 index 0000000000..349c87b6a0 --- /dev/null +++ b/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +ToolsTreeDistribution=|fedora +ToolsTreeDistribution=|centos + +[Build] +ToolsTreePackages= + pkgconfig(blkid) + pkgconfig(libcap) + pkgconfig(libcryptsetup) + pkgconfig(libcurl) + pkgconfig(fdisk) + pkgconfig(libmicrohttpd) + pkgconfig(mount) + tss2-devel + python3-jinja2 diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf new file mode 100644 index 0000000000..74cb1e90e6 --- /dev/null +++ b/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +ToolsTreeDistribution=|debian +ToolsTreeDistribution=|ubuntu + +[Build] +ToolsTreePackages= + libblkid-dev + libcap-dev + libcryptsetup-dev + libcurl4-openssl-dev + libfdisk-dev + libmicrohttpd-dev + libmount-dev + libtss2-dev + python3-jinja2 diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf b/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf new file mode 100644 index 0000000000..2f4f7e1d60 --- /dev/null +++ b/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +ToolsTreeDistribution=opensuse + +[Build] +ToolsTreePackages= + pkgconfig(blkid) + pkgconfig(libcap) + pkgconfig(libcryptsetup) + pkgconfig(libcurl) + pkgconfig(fdisk) + pkgconfig(libmicrohttpd) + pkgconfig(mount) + tss2-devel + python3-jinja2 -- cgit v1.2.3