From 1489f754197a7a013e17328f9cb2fb3d2e5bdfe9 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Fri, 3 May 2013 04:52:32 +0200 Subject: arch-nspawn: setarch to CARCH Allows calling makechrootpkg without worrying about the architecture --- archbuild.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'archbuild.in') diff --git a/archbuild.in b/archbuild.in index 9f1b98a..097cc37 100644 --- a/archbuild.in +++ b/archbuild.in @@ -69,7 +69,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then "${base_packages[@]}" || abort else lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot" - setarch ${arch} arch-nspawn \ + arch-nspawn \ -C "@pkgdatadir@/pacman-${repo}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ @@ -77,4 +77,4 @@ else fi msg "Building in chroot for [${repo}] (${arch})..." -exec setarch "${arch}" makechrootpkg "${makechrootpkg_args[@]}" -r "${chroots}/${repo}-${arch}" +exec makechrootpkg "${makechrootpkg_args[@]}" -r "${chroots}/${repo}-${arch}" -- cgit v1.2.3-54-g00ecf From 38692e8d742a99e78b6f157c65dcf06dbf0c4c02 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 6 May 2013 01:35:21 +0200 Subject: archbuild: Correct makechrootpkg argument order The user-passed makechrootpkg_args may contain a "--" to pass arguments to makepkg. In this case, the order is wrong. --- archbuild.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archbuild.in') diff --git a/archbuild.in b/archbuild.in index 097cc37..b1c96f9 100644 --- a/archbuild.in +++ b/archbuild.in @@ -77,4 +77,4 @@ else fi msg "Building in chroot for [${repo}] (${arch})..." -exec makechrootpkg "${makechrootpkg_args[@]}" -r "${chroots}/${repo}-${arch}" +exec makechrootpkg -r "${chroots}/${repo}-${arch}" "${makechrootpkg_args[@]}" -- cgit v1.2.3-54-g00ecf