diff options
| author | gjb <gjb@FreeBSD.org> | 2014-08-24 12:50:50 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-08-24 12:50:50 +0000 |
| commit | 6cc6bc54dceaf1129fdc2784f378f47b9208de5d (patch) | |
| tree | b09cbb58982f9337e0731723b58e1970cf7555ac /release/release.sh | |
| parent | fc2af2222055f2fbf5c05a1d7a37dce20dae9f59 (diff) | |
| download | FreeBSD-src-6cc6bc54dceaf1129fdc2784f378f47b9208de5d.zip FreeBSD-src-6cc6bc54dceaf1129fdc2784f378f47b9208de5d.tar.gz | |
Set OSREL and UNAME_r in release/release.sh when building
ports to prevent ports build failures from killing the
release build.
MFC after: 3 days
X-MFC-with: r270417, r270418
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/release.sh')
| -rwxr-xr-x | release/release.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/release/release.sh b/release/release.sh index 9d345a0..858c7c8 100755 --- a/release/release.sh +++ b/release/release.sh @@ -255,9 +255,13 @@ 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 fi |
