From 744fe45b8ff1fef5354d803c4d97b57feaa8391d Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 30 Apr 2024 11:39:36 +0200 Subject: [PATCH 1/2] mkosi: Simplify rpm build scripts --- .../mkosi.conf.d/10-centos-fedora/mkosi.build.chroot | 11 ++++------- .../mkosi.conf.d/10-opensuse/mkosi.build.chroot | 8 +++----- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot index fb3ca65ab3..498c52e011 100755 --- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot @@ -46,24 +46,21 @@ ANNOBIN="no-active-checks" rpmbuild \ --build-in-place \ --with upstream \ $( ((WITH_TESTS)) || echo "--nocheck") \ - $( ((WITH_DOCS)) || echo "--without docs") \ + $( ((WITH_DOCS)) || echo "--without=docs") \ --define "_topdir /var/tmp" \ --define "_sourcedir pkg/$ID" \ --define "_rpmdir $OUTPUTDIR" \ - ${BUILDDIR:+--define} \ - ${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \ + ${BUILDDIR:+"--define=_vpath_builddir $BUILDDIR"} \ --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \ --define "_binary_payload w.ufdio" \ - $( ((WITH_DEBUG)) || echo --define) \ - $( ((WITH_DEBUG)) || echo "debug_package %{nil}") \ + $( ((WITH_DEBUG)) || echo "--define=debug_package %{nil}") \ --define "version_override $VERSION" \ --define "release_override $RELEASE" \ --define "build_cflags $CFLAGS" \ --define "meson_build %{shrink:%{__meson} compile -C %{_vpath_builddir} -j %{_smp_build_ncpus} %{nil}}" \ --define "meson_install %{shrink:DESTDIR=%{buildroot} %{__meson} install -C %{_vpath_builddir} --no-rebuild --quiet %{nil}}" \ --define "meson_extra_configure_options -D mode=developer -D b_sanitize=${SANITIZERS:-none}" \ - $( ((WITH_DEBUG)) || echo --define) \ - $( ((WITH_DEBUG)) || echo "__brp_strip %{nil}") \ + $( ((WITH_DEBUG)) || echo "--define=__brp_strip %{nil}") \ --define "__brp_compress %{nil}" \ --define "__brp_mangle_shebangs %{nil}" \ --define "__brp_strip_comment_note %{nil}" \ diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot index da4c1df556..8a2df74236 100755 --- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot @@ -52,16 +52,14 @@ build() { -bb \ --build-in-place \ --with upstream \ - $( ((WITH_TESTS)) || echo --nocheck) \ + $( ((WITH_TESTS)) || echo "--nocheck") \ --define "_topdir /var/tmp" \ --define "_sourcedir pkg/$ID" \ --define "_rpmdir $OUTPUTDIR" \ - ${BUILDDIR:+--define} \ - ${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \ + ${BUILDDIR:+"--define=_vpath_builddir $BUILDDIR"} \ --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \ --define "_binary_payload w.ufdio" \ - $( ((WITH_DEBUG)) || echo --define) \ - $( ((WITH_DEBUG)) || echo "debug_package %{nil}") \ + $( ((WITH_DEBUG)) || echo "--define=debug_package %{nil}") \ --define "vendor openSUSE" \ --define "version_override $VERSION" \ --define "release_override $RELEASE" \ From 742b77e1d2e3c01f1bdd9733dea1ffa2b780cfd3 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 30 Apr 2024 11:41:02 +0200 Subject: [PATCH 2/2] mkosi: Make sure we create an image without /var/log/journal This allows journald to create the directory itself with the right chattr settings on first boot. --- mkosi.images/system/mkosi.postinst.chroot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mkosi.images/system/mkosi.postinst.chroot b/mkosi.images/system/mkosi.postinst.chroot index 43978316fc..f2b0ba09c2 100755 --- a/mkosi.images/system/mkosi.postinst.chroot +++ b/mkosi.images/system/mkosi.postinst.chroot @@ -68,3 +68,7 @@ rm -f /etc/resolv.conf for f in "$BUILDROOT"/usr/share/*.verity.sig; do jq --join-output '.rootHash' "$f" >"${f%.verity.sig}.roothash" done + +# We want /var/log/journal to be created on first boot so it can be created with the right chattr settings by +# systemd-journald. +rm -r "$BUILDROOT/var/log/journal"