From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 2 Jun 2024 15:07:53 +0000 (+0200)
Subject: mkosi: Use env where appropriate
X-Git-Tag: v256-rc4~31^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a88774c96bff269c58defc06803d48a3a78a3a2;p=thirdparty%2Fsystemd.git

mkosi: Use env where appropriate
---

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 f3981c99a43..9895f23908c 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
@@ -47,7 +47,9 @@ IFS=
 # TODO: Replace meson_build and meson_install overrides with "--undefine __meson_verbose" once
 # https://github.com/mesonbuild/meson/pull/12835 is available.
 # shellcheck disable=SC2046
-ANNOBIN="no-active-checks" rpmbuild \
+env \
+ANNOBIN="no-active-checks" \
+rpmbuild \
     -bb \
     --build-in-place \
     --with upstream \
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
index 8819b46eaf1..023cfdf632a 100755
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
@@ -45,25 +45,26 @@ cat debian/changelog >>debian/changelog.new
 mv debian/changelog.new debian/changelog
 
 build() {
-    DEB_BUILD_OPTIONS=$(awk '$1=$1' <<<"\
+    env \
+    DEB_BUILD_OPTIONS="$(awk '$1=$1' <<<"\
         $( ((WITH_TESTS)) || echo nocheck) \
         $( ((WITH_DOCS)) || echo nodoc) \
         $( ((WITH_DEBUG)) && echo debug || echo nostrip) \
         terse \
         optimize=-lto \
         hardening=-fortify \
-    ") \
-    DEB_BUILD_PROFILES=$(awk '$1=$1' <<<"\
+    ")" \
+    DEB_BUILD_PROFILES="$(awk '$1=$1' <<<"\
         $( ((WITH_TESTS)) || echo nocheck) \
         $( ((WITH_DOCS)) || echo nodoc) \
         pkg.systemd.upstream \
-    ") \
+    ")" \
     DEB_CFLAGS_APPEND="-O${OPTIMIZATION:-0}" \
     DPKG_FORCE="unsafe-io" \
     DPKG_DEB_COMPRESSOR_TYPE="none" \
     DH_MISSING="--fail-missing" \
     CONFFLAGS_UPSTREAM="-D mode=developer -D b_sanitize=${SANITIZERS:-none}" \
-    dpkg-buildpackage \
+        dpkg-buildpackage \
         --no-pre-clean \
         --unsigned-changes \
         --build=binary