mkosi: Disable makepkg PKGBUILD linting using the newly added environment variable

(cherry picked from commit 27a8a29e32fbfc9ca350f58b97ef70ce9e6ea988)

diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot b/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot
index 8d501ecb76cb17da6b73113dd2a41b3cdce5c5e1..554c6be3ed69a2f323489c2407b3b90c8cadfcaf 100755 (executable)
--- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot
+++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot
@@ -58,9 +58,6 @@ OPTIONS=(
 )
 EOF
 
-# Linting the PKGBUILD takes multiple seconds every build so avoid that by nuking all the linting functions.
-rm /usr/share/makepkg/lint_pkgbuild/*
-
 TS="${SOURCE_DATE_EPOCH:-$(date +%s)}"
 
 sed --in-place "pkg/$PKG_SUBDIR/PKGBUILD" \
@@ -72,9 +69,11 @@ sed --in-place "pkg/$PKG_SUBDIR/PKGBUILD" \
 patch -Np1 -i pkg/arch/0001-Use-Arch-Linux-device-access-groups.patch
 
 # We get around makepkg's root check by setting EUID to something else.
+# Linting the PKGBUILD takes multiple seconds every build so avoid that by nuking all the linting functions.
 # shellcheck disable=SC2046
 env --chdir="pkg/$PKG_SUBDIR" \
     EUID=123 \
+    MAKEPKG_LINT_PKGBUILD=0 \
     makepkg \
     --noextract \
     --noprepare \