From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 4 Jun 2024 14:03:45 +0000 (+0200)
Subject: mkosi: Stop sourcing /etc/makepkg.conf
X-Git-Tag: v256-rc4~20^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F33199%2Fhead;p=thirdparty%2Fsystemd.git

mkosi: Stop sourcing /etc/makepkg.conf

We don't need this anymore since we now just do delayed evaluation
of $CFLAGS in /etc/makepkg.conf and it imports $CFLAGS into the
script environment which messes everything up.
---

diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
index 7c862d527c6..1f6e0c328cd 100755
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
@@ -21,9 +21,6 @@ ln --symbolic "$BUILDDIR" "pkg/$ID/build"
 # Because we run with --noextract we are responsible for making sure the source files appear in src/.
 ln --symbolic . "pkg/$ID/src"
 
-# shellcheck source=/dev/null
-. /etc/makepkg.conf
-
 MKOSI_CFLAGS="-O0 -Wp,-U_FORTIFY_SOURCE"
 if ((LLVM)); then
     # TODO: Remove -fno-sanitize-function when https://github.com/systemd/systemd/issues/29972 is fixed.