diff options
author | gjb <gjb@FreeBSD.org> | 2014-08-27 00:50:51 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2014-08-27 00:50:51 +0000 |
commit | 339221a5fa75810595147aaa1392b62185ccaa17 (patch) | |
tree | a876b7f579ad9599211094889a113f8dfdff21b3 /release/arm | |
parent | 80176f5f2d86922053d92681653422ab1c14c6d0 (diff) | |
download | FreeBSD-src-339221a5fa75810595147aaa1392b62185ccaa17.zip FreeBSD-src-339221a5fa75810595147aaa1392b62185ccaa17.tar.gz |
MFC r270417, r270418, r270455, r270457:
r270417:
Fix arm build breakage when building stable/10 on
head/.
r270418:
Also export UNAME_r to fix arm builds.
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
Diffstat (limited to 'release/arm')
-rwxr-xr-x | release/arm/release.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/release/arm/release.sh b/release/arm/release.sh index 0869b00..452a73d 100755 --- a/release/arm/release.sh +++ b/release/arm/release.sh @@ -92,6 +92,14 @@ install_uboot() { } main() { + # Fix broken ports that use kern.osreldate. + OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) + export OSVERSION + REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) + BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) + UNAME_r=${REVISION}-${BRANCH} + export UNAME_r + # Build the 'xdev' target for crochet. eval chroot ${CHROOTDIR} make -C /usr/src \ ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ |