mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
27 lines
998 B
Diff
27 lines
998 B
Diff
From 28e5357b1c6b0851ac171249fb10f8b170faf0c3 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
|
Date: Sun, 3 Jul 2016 21:32:15 -0600
|
|
Subject: [PATCH 7/9] makechrootpkg: don't delete MAKEFLAGS and PACKAGER
|
|
|
|
---
|
|
makechrootpkg.in | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
|
index f1a8437..f0378b3 100644
|
|
--- a/makechrootpkg.in
|
|
+++ b/makechrootpkg.in
|
|
@@ -164,9 +164,7 @@ prepare_chroot() {
|
|
|
|
$install -d "$copydir"/{build,startdir,{pkg,srcpkg,src,log}dest}
|
|
|
|
- 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 \
|
|
- "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
|
|
+ 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"
|
|
--
|
|
2.36.1
|
|
|