Merge pull request #31908 from DaanDeMeyer/mkosi

Various mkosi fixes

.gitmodules

@@ -16,5 +16,5 @@
 	branch = c9s-sig-hyperscale
 [submodule "pkg/arch"]
 	path = pkg/arch
-	url = https://gitlab.archlinux.org/daandemeyer/systemd.git
-	branch = strip
+	url = https://gitlab.archlinux.org/archlinux/packaging/packages/systemd
+	branch = main

mkosi.conf

@@ -41,3 +41,5 @@ KernelCommandLineExtra=systemd.crash_shell
                        enforcing=0
                        systemd.early_core_pattern=/core
                        systemd.firstboot=no
+                       systemd.setenv=SYSTEMD_ENABLE_LOG_CONTEXT=yes
+                       SYSTEMD_ENABLE_LOG_CONTEXT=yes

mkosi.images/base/mkosi.conf

@@ -31,6 +31,7 @@ Packages=
         kexec-tools
         kmod
         less
+        man
         mtools
         nano
         nftables

mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot

@@ -23,7 +23,7 @@ mount --mkdir --rbind "$PWD/pkg/$PKG_SUBDIR" "pkg/$PKG_SUBDIR/src/"
 # tmpfs during the build script so these changes don't end up in the image itself.
 tee --append /etc/makepkg.conf >/dev/null <<EOF
 CFLAGS="$CFLAGS -Og"
-OPTIONS=(!strip docs !libtool !staticlibs emptydirs !zipman purge debug !lto)
+OPTIONS=(!strip docs !libtool !staticlibs emptydirs !zipman purge !debug !lto)
 EOF
 
 # Linting the PKGBUILD takes multiple seconds every build so avoid that by nuking all the linting functions.
@@ -35,6 +35,10 @@ else
     TS="${SOURCE_DATE_EPOCH:-$(date +%s)}"
 fi
 
+sed --in-place "pkg/$PKG_SUBDIR/PKGBUILD" \
+    --expression "s/^_tag=.*/_tag=$(cat meson.version)/" \
+    --expression "s/^pkgrel=.*/pkgrel=$(date "+%Y%m%d%H%M%S" --date "@$TS")/"
+
 # We get around makepkg's root check by setting EUID to something else.
 # shellcheck disable=SC2046
 env --chdir="pkg/$PKG_SUBDIR" \
@@ -48,6 +52,4 @@ env --chdir="pkg/$PKG_SUBDIR" \
     BUILDDIR="$PWD/pkg/$PKG_SUBDIR" \
     PKGDEST="$PACKAGEDIR" \
     PKGEXT=".pkg.tar" \
-    PKGVER="$(cat meson.version)" \
-    PKGREL="$(date "+%Y%m%d%H%M%S" --date "@$TS")" \
     MESON_EXTRA_CONFIGURE_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"

mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.conf

@@ -35,6 +35,7 @@ Packages=
         libasan
         libcap-ng-utils
         libubsan
+        man-db
         netcat
         openssh-clients
         openssh-server

mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.conf

@@ -41,6 +41,7 @@ Packages=
         libcap-ng-utils
         libtss2-rc0
         libtss2-tcti-device0
+        man-db
         netcat-openbsd
         openssh-client
         openssh-server