diff options
| author | Lennart Poettering <lennart@poettering.net> | 2024-01-24 12:28:41 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2024-01-25 18:47:39 +0100 |
| commit | b68f4cade487aef4aab880d39cc553dbd6fed364 (patch) | |
| tree | 154567271a00c291a4d56ea819a0c3d3c75bda9f /mkosi.images | |
| parent | man: Document ranges for distributions config files and local config files (diff) | |
| download | systemd-b68f4cade487aef4aab880d39cc553dbd6fed364.tar.xz systemd-b68f4cade487aef4aab880d39cc553dbd6fed364.zip | |
dissect: add --make-archive option to convert DDI to tarball
Diffstat (limited to 'mkosi.images')
| -rwxr-xr-x | mkosi.images/base/mkosi.build.chroot | 1 | ||||
| -rw-r--r-- | mkosi.images/base/mkosi.conf.d/10-arch.conf | 1 | ||||
| -rw-r--r-- | mkosi.images/base/mkosi.conf.d/10-centos-fedora.conf | 2 | ||||
| -rw-r--r-- | mkosi.images/base/mkosi.conf.d/10-debian-ubuntu.conf | 2 | ||||
| -rw-r--r-- | mkosi.images/base/mkosi.conf.d/10-opensuse.conf | 2 |
5 files changed, 8 insertions, 0 deletions
diff --git a/mkosi.images/base/mkosi.build.chroot b/mkosi.images/base/mkosi.build.chroot index 9524fdb103..f164c954b7 100755 --- a/mkosi.images/base/mkosi.build.chroot +++ b/mkosi.images/base/mkosi.build.chroot @@ -153,6 +153,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then -D initrd=true -D fexecve=true -D default-keymap="$DEFAULT_KEYMAP" + -D libarchive=enabled ) # On debian-like systems the library directory is not /usr/lib64 but /usr/lib/<arch-triplet>/. diff --git a/mkosi.images/base/mkosi.conf.d/10-arch.conf b/mkosi.images/base/mkosi.conf.d/10-arch.conf index 7ab0c712ae..385c73979f 100644 --- a/mkosi.images/base/mkosi.conf.d/10-arch.conf +++ b/mkosi.images/base/mkosi.conf.d/10-arch.conf @@ -8,6 +8,7 @@ Packages= cryptsetup dbus gnutls + libarchive libbpf libfido2 libmicrohttpd diff --git a/mkosi.images/base/mkosi.conf.d/10-centos-fedora.conf b/mkosi.images/base/mkosi.conf.d/10-centos-fedora.conf index 4dec24cc20..def5eaa2de 100644 --- a/mkosi.images/base/mkosi.conf.d/10-centos-fedora.conf +++ b/mkosi.images/base/mkosi.conf.d/10-centos-fedora.conf @@ -9,6 +9,7 @@ Packages= audit-libs cryptsetup-libs gnutls + libarchive libasan libbpf libfido2 @@ -39,6 +40,7 @@ BuildPackages= pkgconfig(glib-2.0) pkgconfig(gnutls) pkgconfig(libacl) + pkgconfig(libarchive) pkgconfig(libbpf) pkgconfig(libcap) pkgconfig(libcryptsetup) diff --git a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu.conf index c529e0b176..fc684a4482 100644 --- a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu.conf +++ b/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu.conf @@ -8,6 +8,7 @@ Distribution=|ubuntu Packages= dmsetup libapparmor1 + libarchive13 libfdisk1 libfido2-1 libglib2.0-0 @@ -30,6 +31,7 @@ BuildPackages= g++ libacl1-dev libapparmor-dev + libarchive-dev libaudit-dev libblkid-dev libbpf-dev diff --git a/mkosi.images/base/mkosi.conf.d/10-opensuse.conf b/mkosi.images/base/mkosi.conf.d/10-opensuse.conf index ec91b4901f..1c00b78322 100644 --- a/mkosi.images/base/mkosi.conf.d/10-opensuse.conf +++ b/mkosi.images/base/mkosi.conf.d/10-opensuse.conf @@ -14,6 +14,7 @@ Packages= grep gzip libbpf1 + libarchive13 libcrypt1 libcryptsetup12 libdw1 @@ -53,6 +54,7 @@ BuildPackages= intltool libacl-devel libapparmor-devel + libarchive-devel libblkid-devel libbpf-devel libcap-devel |