summaryrefslogtreecommitdiff
path: root/archbuild.in
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-15 11:00:02 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-15 11:00:02 -0600
commiteba252eca59c3d110e90c97d114bacceca343426 (patch)
treec771345d885f449648b2e252bcc4c8fdd6d2d30c /archbuild.in
parentbf8513ae631484a0c292ad085ea7ede9859f8e0f (diff)
parent453558c4bb44b4bff43fcd22f96d4cfe1dbcf6f1 (diff)
downloaddevtools-eba252eca59c3d110e90c97d114bacceca343426.tar.xz
Merge commit '4535'
Conflicts: makechrootpkg.in mkarchroot.in
Diffstat (limited to 'archbuild.in')
-rw-r--r--archbuild.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/archbuild.in b/archbuild.in
index 06c9815..38fb8bf 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -68,11 +68,11 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
"${chroots}/${repo}-${arch}/root" \
"${base_packages[@]}" || abort
else
- setarch ${arch} mkarchroot \
- -u \
+ setarch ${arch} arch-nspawn \
-C "@pkgdatadir@/pacman-${repo}.conf" \
-M "@pkgdatadir@/makepkg-${arch}.conf" \
- "${chroots}/${repo}-${arch}/root" || abort
+ "${chroots}/${repo}-${arch}/root" \
+ pacman -Syu --noconfirm || abort
fi
msg "Building in chroot for [${repo}] (${arch})..."