2018-05-31 18:51:19 +00:00
|
|
|
From cfbf534257c461056f670e86896c1e7ffeafabde 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
|
2018-05-31 18:51:19 +00:00
|
|
|
index 3ff3673..b1e96af 100644
|
2016-07-04 03:33:59 +00:00
|
|
|
--- a/makechrootpkg.in
|
|
|
|
+++ b/makechrootpkg.in
|
2018-05-31 18:51:19 +00:00
|
|
|
@@ -184,9 +184,7 @@ prepare_chroot() {
|
|
|
|
|
|
|
|
$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"
|
|
|
|
--
|
2018-05-29 00:55:47 +00:00
|
|
|
2.16.2
|
2016-07-04 03:33:59 +00:00
|
|
|
|