mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00
Code Issues Releases Activity

ports-mgmt/poudriere: Bring in fix for distclean make.conf error

Browse Source 
Fixes https://github.com/freebsd/poudriere/issues/910
This commit is contained in:
Bryan Drewery 2021-08-30 10:20:21 -07:00
parent 9dae753b09
commit c555f0f92a
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/poudriere/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= poudriere
DISTVERSION= 3.3.7
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= ports-mgmt
MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
http://mirror.shatow.net/freebsd/${PORTNAME}/ \

24
ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 Normal file
View File

@ -0,0 +1,24 @@
commit 8bfaa898b32370bbfff9bf37fc833d7abc4b8b67
Author: Bryan Drewery <bryan@shatow.net>
Date: Sat Aug 28 11:57:56 2021 -0700
distclean: Fix reading make.conf
Fixes #910
Fixes fa0308152e6 ("Move make.conf ports_env handling to its own not-spammy file")
(cherry picked from commit 95971acb6ffd51b2432a38efd1111dd189f68edd)
diff --git src/share/poudriere/distclean.sh src/share/poudriere/distclean.sh
index 08889f1dd..f77163fc4 100755
--- src/share/poudriere/distclean.sh
+++ src/share/poudriere/distclean.sh
@@ -144,7 +144,7 @@ for PTNAME in ${PTNAMES}; do
__MAKE_CONF=$(mktemp -t poudriere-make.conf)
export __MAKE_CONF
- setup_ports_env "/" "${__MAKE_CONF}"
+ setup_ports_env "" "${__MAKE_CONF}"
if [ -z "${NO_PACKAGE_BUILDING}" ]; then
echo "BATCH=yes"
echo "PACKAGE_BUILDING=yes"