summaryrefslogtreecommitdiffstats
path: root/mkosi.images
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-09-15 10:25:06 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-09-15 12:44:15 +0200
commit27a8a29e32fbfc9ca350f58b97ef70ce9e6ea988 (patch)
tree03075eb0716034476c83b2297d716cb4c0b188ec /mkosi.images
parentMerge pull request #34409 from DaanDeMeyer/boot-fix (diff)
downloadsystemd-27a8a29e32fbfc9ca350f58b97ef70ce9e6ea988.tar.xz
systemd-27a8a29e32fbfc9ca350f58b97ef70ce9e6ea988.zip
mkosi: Disable makepkg PKGBUILD linting using the newly added environment variable
Diffstat (limited to 'mkosi.images')
-rwxr-xr-xmkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot5
1 files 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 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 \