From c72ca3d539072acf55b4deb3a5646ce0717f08a1 Mon Sep 17 00:00:00 2001 From: Alastair Hughes Date: Sat, 6 Feb 2016 20:54:31 +1300 Subject: Make "makepkg -g" ignore the current architecture. Commit 663c74150ab4ba6d3adc55b0e3f539557a16e352 (makepkg: merge arch dependent variables after PKGBUILD linting) broke "makepkg -g" on a PKGBUILD which did not include the current architecture, by moving the lint_pkgbuild call before GENINTEG was processed. Fix that by setting IGNOREARCH for the "-g" option. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 80b95f41..16c21b72 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1803,7 +1803,8 @@ while true; do -e|--noextract) NOEXTRACT=1 ;; -f|--force) FORCE=1 ;; -F) INFAKEROOT=1 ;; - -g|--geninteg) GENINTEG=1 ;; + # generating integrity checks does not depend on architecture + -g|--geninteg) GENINTEG=1 IGNOREARCH=1;; --holdver) HOLDVER=1 ;; -i|--install) INSTALL=1 ;; --key) shift; GPGKEY=$1 ;; -- cgit v1.2.3-70-g09d2