PKGBUILDs/alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch

28 lines
998 B
Diff
Raw Normal View History

2019-09-21 15:13:45 +00:00
From a0d662502a0aab38f3ad07222fc40b74053bbea2 Mon Sep 17 00:00:00 2001
2016-07-04 03:33:59 +00:00
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 3 Jul 2016 21:32:15 -0600
2018-05-31 18:51:19 +00:00
Subject: [PATCH 7/7] makechrootpkg: don't delete MAKEFLAGS and PACKAGER
2016-07-04 03:33:59 +00:00
---
makechrootpkg.in | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
2019-09-21 15:13:45 +00:00
index 086a0a6..bd97afb 100644
2016-07-04 03:33:59 +00:00
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
2019-09-21 15:13:45 +00:00
@@ -188,9 +188,7 @@ prepare_chroot() {
2018-05-31 18:51:19 +00:00
$install -d "$copydir"/{build,startdir,{pkg,srcpkg,src,log}dest}
2016-07-04 03:33:59 +00:00
- sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
- for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \
2017-12-13 01:42:01 +00:00
- "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
2016-07-04 03:33:59 +00:00
+ for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest
do
grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
echo "$x" >>"$copydir/etc/makepkg.conf"
--
2019-09-21 15:13:45 +00:00
2.22.0
2016-07-04 03:33:59 +00:00