aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2017-11-30 20:53:57 +0000
committerGlen Barber <gjb@FreeBSD.org>2017-11-30 20:53:57 +0000
commit30ba43e1a690094d5458e6713a6387b6a2f946da (patch)
tree624e876503a08253d35fffc37161882de57efae2 /release/release.sh
parentc205468e0069f1f65e57d344a9966b09ce29b54d (diff)
downloadsrc-30ba43e1a690094d5458e6713a6387b6a2f946da.tar.gz
src-30ba43e1a690094d5458e6713a6387b6a2f946da.zip
Fix port build flags passed to make(1) after r326315, where
it was missed for embedded image builds. MFC after: 3 days MFC with: r326315 Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=326412
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/release/release.sh b/release/release.sh
index 25f17df0ab13..d1afbf57011e 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -282,8 +282,9 @@ extra_chroot_setup() {
PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports"
PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
- chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
- ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
+ chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \
+ /usr/ports/textproc/docproj \
+ OPTIONS_UNSET="FOP IGOR" \
FORCE_PKG_REGISTER=1 \
install clean distclean
fi
@@ -296,9 +297,12 @@ extra_chroot_setup() {
PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports"
+ PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
for _PORT in ${EMBEDDEDPORTS}; do
- eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
- FORCE_PKG_REGISTER=1 ${PBUILD_FLAGS} install clean distclean
+ eval chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \
+ /usr/ports/${_PORT} \
+ FORCE_PKG_REGISTER=1 install clean distclean
done
fi