mkosi: Use --auto-features=enabled for meson

diff --git a/mkosi.images/base/mkosi.build.chroot b/mkosi.images/base/mkosi.build.chroot
index 3374c80bb96b1fe989a4a975765c82b8f0ecb21b..ce3c8e25772a74289da952daf5e72e4f7105692c 100755 (executable)
--- a/mkosi.images/base/mkosi.build.chroot
+++ b/mkosi.images/base/mkosi.build.chroot
@@ -44,23 +44,8 @@ EOF
 fi
 
 if [ ! -f "$BUILDDIR"/build.ninja ]; then
-    [[ -d /etc/rc.d/init.d ]] && sysvinit_path="/etc/rc.d/init.d" || sysvinit_path="/etc/init.d"
-
-    if [ "$ID" = "centos" ] && [ "$VERSION" = "8" ]; then
-        UKIFY="disabled"
-    else
-        UKIFY="enabled"
-    fi
-
-    # On Debian 'loadkeys us' fails
-    if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then
-        DEFAULT_KEYMAP=""
-    else
-        DEFAULT_KEYMAP="us"
-    fi
-
     CONFIGURE_OPTS=(
-        -D sysvinit-path="$sysvinit_path"
+        -D sysvinit-path="$([[ -d /etc/rc.d/init.d ]] && echo /etc/rc.d/init.d || echo /etc/init.d)"
         -D man=disabled
         -D translations=false
         -D version-tag="${VERSION_TAG}"
@@ -79,8 +64,6 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         -D tpm=true
         -D environment-d=true
         -D binfmt=true
-        -D repart=enabled
-        -D sysupdate=enabled
         -D coredump=true
         -D pstore=true
         -D oomd=true
@@ -91,14 +74,10 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         -D portabled=true
         -D sysext=true
         -D userdb=true
-        -D homed=enabled
         -D networkd=true
         -D timedated=true
         -D timesyncd=true
-        -D remote=enabled
         -D nss-myhostname=true
-        -D nss-mymachines=enabled
-        -D nss-resolve=enabled
         -D nss-systemd=true
         -D firstboot=true
         -D randomseed=true
@@ -107,53 +86,26 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         -D quotacheck=true
         -D sysusers=true
         -D tmpfiles=true
-        -D importd=enabled
         -D hwdb=true
         -D rfkill=true
         -D xdg-autostart=true
         -D translations=true
-        -D polkit=enabled
-        -D acl=enabled
-        -D audit=enabled
-        -D blkid=enabled
-        -D fdisk=enabled
-        -D kmod=enabled
-        -D pam=enabled
-        -D pwquality=enabled
-        -D microhttpd=enabled
-        -D libcryptsetup=enabled
-        -D libcurl=enabled
         -D idn=true
-        -D libidn2=enabled
-        -D qrencode=enabled
-        -D gcrypt=enabled
-        -D gnutls=enabled
-        -D openssl=enabled
         -D cryptolib=openssl
-        -D p11kit=enabled
-        -D libfido2=enabled
-        -D tpm2=enabled
-        -D elfutils=enabled
-        -D zstd=enabled
-        -D xkbcommon=enabled
-        -D pcre2=enabled
-        -D glib=enabled
-        -D dbus=enabled
-        -D bootloader=enabled
         -D kernel-install=true
         -D analyze=true
-        -D bpf-framework=enabled
-        -D ukify="$UKIFY"
-        -D seccomp=enabled
-        -D selinux=auto
-        -D apparmor=auto
+        -D ukify="$([[ "$ID" = "centos" ]] && [[ "$VERSION" = "8" ]] && echo disabled || echo enabled)"
+        -D selinux="$([[ "$ID" =~ centos|fedora|opensuse ]] && echo enabled || echo disabled)"
+        -D apparmor="$([[ "$ID" =~ ubuntu|debian ]] && echo enabled || echo disabled)"
         -D smack=true
         -D ima=true
         -D first-boot-full-preset=true
         -D initrd=true
         -D fexecve=true
-        -D default-keymap="$DEFAULT_KEYMAP"
-        -D libarchive=enabled
+        -D default-keymap="$([[ "$ID" =~ debian|ubuntu ]] && echo "" || echo "us")"
+        -D xenctrl="$([[ "$ID" =~ debian|ubuntu|fedora|opensuse ]] && echo enabled || echo disabled)"
+        -D libiptc="$([[ "$ID" =~ debian|ubuntu ]] && echo enabled || echo disabled)"
+        -D libcryptsetup-plugins="$([[ "$ID" = "centos" ]] && [[ "$VERSION" = "8" ]] && echo disabled || echo enabled)"
     )
 
     # On debian-like systems the library directory is not /usr/lib64 but /usr/lib/<arch-triplet>/.
@@ -200,7 +152,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         )
     fi
 
-    ( set -x; meson setup "$BUILDDIR" "$SRCDIR" "${CONFIGURE_OPTS[@]}" )
+    ( set -x; meson setup "$BUILDDIR" "$SRCDIR" --auto-features=enabled "${CONFIGURE_OPTS[@]}" )
 fi
 
 ( set -x; ninja -C "$BUILDDIR" "$@" )

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 def5eaa2ded9a77958731d4974a14a4ca1d7bc09..478b0ea81818008ee101b5ce878ab5e954eeb99a 100644 (file)
--- a/mkosi.images/base/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.images/base/mkosi.conf.d/10-centos-fedora.conf
@@ -49,6 +49,7 @@ BuildPackages=
         pkgconfig(libfido2)
         pkgconfig(libidn2)
         pkgconfig(libkmod)
+        pkgconfig(liblz4)
         pkgconfig(libmicrohttpd)
         pkgconfig(libnftnl)
         pkgconfig(libpcre2-8)

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 fc684a4482f72a2bfbd896c2cbb2d1b8d7dea859..1d28be30f823079fc0cf51abac8b7d92b8844721 100644 (file)
--- a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu.conf
@@ -6,6 +6,7 @@ Distribution=|ubuntu
 
 [Content]
 Packages=
+        ^libtss2-esys-[0-9\.]+-0$
         dmsetup
         libapparmor1
         libarchive13
@@ -14,6 +15,7 @@ Packages=
         libglib2.0-0
         libgnutls30
         libidn2-0
+        liblz4-1
         libmicrohttpd12
         libnftnl11
         libp11-kit0
@@ -22,7 +24,9 @@ Packages=
         libqrencode4
         libssl3
         libip4tc2
-        libtss2-dev # Use the -dev package to avoid churn in updating version numbers
+        ^libtss2-mu[0-9\.-]+$
+        libtss2-rc0
+        libtss2-tcti-device0
         tzdata
 
 BuildPackages=
@@ -49,6 +53,7 @@ BuildPackages=
         libidn2-dev
         libiptc-dev
         libkmod-dev
+        liblz4-dev
         libmicrohttpd-dev
         libmount-dev
         libnftnl-dev
@@ -59,6 +64,7 @@ BuildPackages=
         libseccomp-dev
         libsmartcols-dev
         libssl-dev
+        libtss2-dev
         libxen-dev
         libxkbcommon-dev
         libzstd-dev

diff --git a/mkosi.images/base/mkosi.conf.d/10-opensuse.conf b/mkosi.images/base/mkosi.conf.d/10-opensuse.conf
index 1c00b78322eacc51ffa5ffb8a37ea8555ed3bd15..941a50a6d19ce98f7f805ca63159cb29489810ee 100644 (file)
--- a/mkosi.images/base/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi.images/base/mkosi.conf.d/10-opensuse.conf
@@ -57,6 +57,7 @@ BuildPackages=
         libarchive-devel
         libblkid-devel
         libbpf-devel
+        libbz2-devel
         libcap-devel
         libcryptsetup-devel
         libcurl-devel
@@ -67,6 +68,7 @@ BuildPackages=
         libgcrypt-devel
         libgnutls-devel
         libkmod-devel
+        liblz4-devel
         libmicrohttpd-devel
         libmount-devel
         libnftnl-devel