PKGBUILDs/alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch

40 lines
1.2 KiB
Diff
Raw Normal View History

2018-05-31 18:51:19 +00:00
From 3c6ea948758d5ffd92e2412c8a9aa398607c140f Mon Sep 17 00:00:00 2001
2014-12-30 02:41:19 +00:00
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 28 Dec 2014 22:33:00 -0700
2018-05-31 18:51:19 +00:00
Subject: [PATCH 4/7] arch-nspawn: arm fix
2014-12-30 02:41:19 +00:00
---
arch-nspawn.in | 2 +-
2017-12-13 01:42:01 +00:00
makechrootpkg.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
2014-12-30 02:41:19 +00:00
diff --git a/arch-nspawn.in b/arch-nspawn.in
2018-05-31 18:51:19 +00:00
index 1821836..fded89f 100644
2014-12-30 02:41:19 +00:00
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
2018-05-31 18:51:19 +00:00
@@ -112,7 +112,7 @@ eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
2014-12-30 02:41:19 +00:00
2017-12-13 01:42:01 +00:00
[[ -z $nosetarch ]] || unset CARCH
2015-12-05 17:10:02 +00:00
-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
+exec systemd-nspawn -q \
-D "$working_dir" \
2017-12-13 01:42:01 +00:00
-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
--register=no --keep-unit --as-pid2 \
2014-12-30 02:41:19 +00:00
diff --git a/makechrootpkg.in b/makechrootpkg.in
2018-05-31 18:51:19 +00:00
index a920c19..bb561ea 100644
2014-12-30 02:41:19 +00:00
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
2018-05-31 18:51:19 +00:00
@@ -260,7 +260,7 @@ download_sources() {
# Ensure sources are downloaded
2018-05-31 18:51:19 +00:00
sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
2017-12-13 01:42:01 +00:00
- makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
+ makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o ||
die "Could not download sources."
# Clean up garbage from verifysource
2014-12-30 02:41:19 +00:00
--
2018-05-29 00:55:47 +00:00
2.16.2
2014-12-30 02:41:19 +00:00