2013-06-27 17:15:42 +00:00
|
|
|
diff -urN a/arch-nspawn.in b/arch-nspawn.in
|
2014-01-22 01:39:39 +00:00
|
|
|
--- a/arch-nspawn.in 2014-01-21 18:16:31.735672829 -0700
|
|
|
|
|
+++ b/arch-nspawn.in 2014-01-21 18:17:31.245439755 -0700
|
|
|
|
|
@@ -97,7 +97,7 @@
|
|
|
|
|
machine_name="${working_dir//[![:alnum:]_-]/-}"
|
|
|
|
|
machine_name="${machine_name#-}"
|
2013-06-27 17:15:42 +00:00
|
|
|
|
|
|
|
|
-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn 2>/dev/null \
|
|
|
|
|
+exec systemd-nspawn 2>/dev/null \
|
|
|
|
|
-D "$working_dir" \
|
2014-01-22 01:39:39 +00:00
|
|
|
--machine "$machine_name" \
|
2013-06-27 17:15:42 +00:00
|
|
|
"${mount_args[@]}" \
|
|
|
|
|
diff -urN a/makechrootpkg.in b/makechrootpkg.in
|
2014-01-22 01:39:39 +00:00
|
|
|
--- a/makechrootpkg.in 2014-01-21 18:17:21.820476669 -0700
|
|
|
|
|
+++ b/makechrootpkg.in 2014-01-21 18:17:31.245439755 -0700
|
|
|
|
|
@@ -272,10 +272,10 @@
|
2013-06-27 17:15:42 +00:00
|
|
|
# Ensure sources are downloaded
|
|
|
|
|
if [[ -n $SUDO_USER ]]; then
|
|
|
|
|
sudo -u $SUDO_USER env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
|
|
|
|
|
- makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o
|
|
|
|
|
+ makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o
|
|
|
|
|
else
|
|
|
|
|
( export SRCDEST BUILDDIR="$builddir"
|
|
|
|
|
- makepkg --asroot --config="$copydir/etc/makepkg.conf" --verifysource -o
|
|
|
|
|
+ makepkg -A --asroot --config="$copydir/etc/makepkg.conf" --verifysource -o
|
|
|
|
|
)
|
|
|
|
|
fi
|
|
|
|
|
(( $? != 0 )) && die "Could not download sources."
|
