[Dev] [PATCH] libretools: fix i686 gpg signature failures

[Luke Shumaker]

On Tue, 20 Mar 2018 16:51:49 -0400,
Andreas Grapentin wrote:
> archlinux32 is building their own arch=(any) packages, which means they
> can't share the same cachedir as the x86_64 built -any packages. This
> patch adds a separate cachedir for each CARCH in librechroot, which
> should solve the signature issues we have seen in libremakepkg.
> 
> -A
> 
> ---
>  src/chroot-tools/librechroot | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
> index 8256d77..4360622 100755
> --- a/src/chroot-tools/librechroot
> +++ b/src/chroot-tools/librechroot
> @@ -94,10 +94,12 @@ hack_arch_nspawn_flags() {
>  
>  		# Let qemu/binfmt_misc do its thing
>  		arch_nspawn_flags+=(-f "$interpreter" -s)
> +	fi
>  
> -		# The -any packages are built separately for ARM from
> -		# x86, so if we use the same CacheDir as the x86 host,
> -		# then there will be PGP errors.
> +	if [[ $CARCH != $(uname -m) ]]; then

On ARM, $CARCH is "armv7h", but $(uname -m) is "armv7l", which means
that it would needlessly create a separate cache when building
natively on ARM.  It should use $setarch instead of $CARCH.

> +		# The -any packages are built seperately for all arches,
> +		# so if we use the same CacheDir as the host, then there
> +		# will be PGP errors.
>  		mkdir -p "/var/cache/pacman/pkg-$CARCH"
>  		arch_nspawn_flags+=(-c "/var/cache/pacman/pkg-$CARCH")
>  	fi
> -- 
> 2.16.2

-- 
Happy hacking,
~ Luke Shumaker