Author: gjb
Date: Wed Aug 27 00:57:45 2014
New Revision: 270690
URL: http://svnweb.freebsd.org/changeset/base/270690
Log:
MFC r270455, r270457:
r270455:
Set OSREL and UNAME_r in release/release.sh when building
ports to prevent ports build failures from killing the
release build.
r270457:
Wrap a long line.
Sponsored by: The FreeBSD Foundation
Modified:
stable/9/release/release.sh
Directory Properties:
stable/9/release/ (props changed)
Modified: stable/9/release/release.sh
==============================================================================
--- stable/9/release/release.sh Wed Aug 27 00:53:56 2014 (r270689)
+++ stable/9/release/release.sh Wed Aug 27 00:57:45 2014 (r270690)
@@ -253,11 +253,16 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then
## Trick the ports 'run-autotools-fixup' target to do the right thing.
_OSVERSION=$(sysctl -n kern.osreldate)
+ REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+ BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+ UNAME_r=${REVISION}-${BRANCH}
if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
- PBUILD_FLAGS="${PBUILD_FLAGS}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
- ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean
distclean
+ ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
+ install clean distclean
fi
fi
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
