summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-10 13:51:50 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-05-11 01:38:50 -0400
commit0845d893d8ca1892d9e392e61cc90f4c7c76c983 (patch)
tree5ab61f18228f8b993460e1cf338281ca6fa5a526 /src
parentcfb712626aa61d1326887a10283ffcaa1ccc4790 (diff)
Update arch-nspawn.patch to latest devtools commit.
Also, move the nosetarch check to reduce the possibility of conflicts in the future.
Diffstat (limited to 'src')
-rw-r--r--src/chroot-tools/arch-nspawn.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch
index 5ebda46..dc4cb25 100644
--- a/src/chroot-tools/arch-nspawn.patch
+++ b/src/chroot-tools/arch-nspawn.patch
@@ -1,5 +1,5 @@
---- arch-nspawn.in 2016-05-09 18:37:11.684488405 -0400
-+++ arch-nspawn.ugly 2016-05-11 01:33:29.914317415 -0300
+--- arch-nspawn.in 2016-05-10 13:48:14.303797115 -0400
++++ arch-nspawn.ugly 2016-05-10 13:48:23.296957958 -0400
@@ -1,4 +1,6 @@
#!/bin/bash
+# License: GNU GPLv2
@@ -52,20 +52,20 @@
sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$working_dir/etc/pacman.conf"
}
# }}}
-@@ -92,11 +106,15 @@
+@@ -92,6 +106,7 @@
fi
build_mount_args
+cache_dirs+=('/repo/')
copy_hostconf
-+if [[ -z $nosetarch ]]; then
eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
-+export _setarch=${CARCH:+setarch "$CARCH"}
-+fi
+@@ -99,6 +114,8 @@
+ armv7h) CARCH=armv7l;;
+ esac
--exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
-+exec $_setarch systemd-nspawn -q \
++[[ -z $nosetarch ]] || unset CARCH
++
+ exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
-D "$working_dir" \
--register=no \
- "${mount_args[@]}" \