[pacman-dev] [PATCH] Make "makepkg -g" ignore the current architecture.

Allan McRae allan at archlinux.org
Sun Feb 7 11:56:01 UTC 2016


On 06/02/16 17:54, Alastair Hughes wrote:
> 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.
> ---
>  scripts/makepkg.sh.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 80b95f4..f9eb888 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -1803,7 +1803,7 @@ while true; do
>  		-e|--noextract)   NOEXTRACT=1 ;;
>  		-f|--force)       FORCE=1 ;;
>  		-F)               INFAKEROOT=1 ;;
> -		-g|--geninteg)    GENINTEG=1 ;;

Committed to my patchqueue branch with and added commit:

# 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 ;;
> 


More information about the pacman-dev mailing list