From bc7c660f7598efb4de58c859f69aebecef6c7fd1 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 28 Dec 2014 22:33:00 -0700 Subject: [PATCH 4/7] arch-nspawn: arm fix --- arch-nspawn.in | 2 +- makechrootpkg.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index a371625..70944c8 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -114,7 +114,7 @@ eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" [[ -z $nosetarch ]] || unset CARCH -exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ +exec systemd-nspawn -q \ -D "$working_dir" \ -E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \ --register=no --keep-unit --as-pid2 \ diff --git a/makechrootpkg.in b/makechrootpkg.in index 94e69ae..8322ee4 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -259,7 +259,7 @@ download_sources() { # Ensure sources are downloaded sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \ env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \ - makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o || + makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o || die "Could not download sources." } -- 2.21.0