mirror of
https://github.com/systemd/systemd.git
synced 2024-11-23 18:23:32 +08:00
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 ... """
This commit is contained in:
parent
4839fb527f
commit
d980aee1e8
8
mkosi.conf.d/05-tools/mkosi.conf
Normal file
8
mkosi.conf.d/05-tools/mkosi.conf
Normal file
@ -0,0 +1,8 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
[Build]
|
||||
ToolsTreePackages=
|
||||
meson
|
||||
gcc
|
||||
gperf
|
||||
pkgconf
|
13
mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf
Normal file
13
mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf
Normal file
@ -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
|
17
mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf
Normal file
17
mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf
Normal file
@ -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
|
17
mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf
Normal file
17
mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf
Normal file
@ -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
|
16
mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf
Normal file
16
mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user