From 2d0b8e9fb614d19cda25c76e4368d09917193d56 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 22 Mar 2024 15:12:20 +0100 Subject: [PATCH 1/4] mkosi: Make sure man and man-db are installed everywhere --- mkosi.images/base/mkosi.conf | 1 + mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.conf | 1 + mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/mkosi.images/base/mkosi.conf b/mkosi.images/base/mkosi.conf index fcefc3ead2..aed8bb5ba8 100644 --- a/mkosi.images/base/mkosi.conf +++ b/mkosi.images/base/mkosi.conf @@ -31,6 +31,7 @@ Packages= kexec-tools kmod less + man mtools nano nftables diff --git a/mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.conf index 4c80b0a36f..1cc7740194 100644 --- a/mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.conf +++ b/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 diff --git a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.conf index 47f3b7f488..07c9b3a805 100644 --- a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.conf +++ b/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 From 1bee93c4c76e4627a599b99c0b42be59ed29cf7c Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 22 Mar 2024 15:15:01 +0100 Subject: [PATCH 2/4] mkosi: Enable log context --- mkosi.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mkosi.conf b/mkosi.conf index 19a3851fd1..a5953d7613 100644 --- a/mkosi.conf +++ b/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 From 97b191c49bf4c1085aeccd94db99f03b4fca481f Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 22 Mar 2024 16:49:10 +0100 Subject: [PATCH 3/4] mkosi: Disable debug package generation on Arch Linux This is extremely slow since the latest pacman release, and since we don't strip binaries, not really needed either. --- mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot index aff566f94c..5304afff28 100755 --- a/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot +++ b/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 < Date: Fri, 22 Mar 2024 16:49:46 +0100 Subject: [PATCH 4/4] mkosi: Switch to Arch Linux packaging sources main branch https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/merge_requests/8 was merged so let's switch branches to the main branch. --- .gitmodules | 4 ++-- mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot | 6 ++++-- pkg/arch | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index ba9f6d7f27..787e4c85f5 100644 --- a/.gitmodules +++ b/.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 diff --git a/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot index 5304afff28..83887b1fba 100755 --- a/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot +++ b/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot @@ -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}" diff --git a/pkg/arch b/pkg/arch index b33762d07c..4d1ecb0835 160000 --- a/pkg/arch +++ b/pkg/arch @@ -1 +1 @@ -Subproject commit b33762d07ce712f5c675bdc8f882a096aa59bf09 +Subproject commit 4d1ecb083589270e9137c8bd3838e6b73bfdbff7