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

40 lines
1.2 KiB
Diff
Raw Normal View History

2022-08-12 02:04:10 +00:00
From 0e72ba89cc863b7545577c3c463a30725cfa7340 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
Subject: [PATCH 4/9] 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
2022-08-12 02:04:10 +00:00
index 2c61371..42f19cc 100644
2014-12-30 02:41:19 +00:00
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
2022-08-12 02:04:10 +00:00
@@ -121,7 +121,7 @@ else
set_arch="${CARCH}"
fi
2014-12-30 02:41:19 +00:00
2022-08-12 02:04:10 +00:00
-exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \
2015-12-05 17:10:02 +00:00
+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
2022-08-12 02:04:10 +00:00
index 0929df1..367f030 100644
2014-12-30 02:41:19 +00:00
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
2022-08-12 02:04:10 +00:00
@@ -238,7 +238,7 @@ download_sources() {
# Ensure sources are downloaded
2022-08-12 02:04:10 +00:00
sudo -u "$makepkg_user" --preserve-env=GNUPGHOME,SSH_AUTH_SOCK \
2019-06-09 21:08:25 +00:00
env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
2019-09-21 15:13:45 +00:00
- makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
+ makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
2017-12-13 01:42:01 +00:00
die "Could not download sources."
2019-06-09 21:08:25 +00:00
}
2017-12-13 01:42:01 +00:00
2014-12-30 02:41:19 +00:00
--
2022-08-12 02:04:10 +00:00
2.36.1
2014-12-30 02:41:19 +00:00