From d1f09ff4cd3891fb2c2f051093e49dd75f09dd5b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 15 Sep 2024 10:25:06 +0200 Subject: [PATCH] mkosi: Disable makepkg PKGBUILD linting using the newly added environment variable (cherry picked from commit 27a8a29e32fbfc9ca350f58b97ef70ce9e6ea988) --- mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 8d501ecb76..554c6be3ed 100755 --- 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 \ -- 2.25.1