From 27a8a29e32fbfc9ca350f58b97ef70ce9e6ea988 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 15 Sep 2024 10:25:06 +0200 Subject: mkosi: Disable makepkg PKGBUILD linting using the newly added environment variable --- mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mkosi.images') 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 81864448c5..cafbafee66 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" \ @@ -68,9 +65,11 @@ sed --in-place "pkg/$PKG_SUBDIR/PKGBUILD" \ --expression "s/^pkgrel=.*/pkgrel=$(date "+%Y%m%d%H%M%S" --date "@$TS")/" # 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 \ -- cgit v1.2.3