diff options
| author | gjb <gjb@FreeBSD.org> | 2015-05-06 15:41:43 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-05-06 15:41:43 +0000 |
| commit | 7a5a99c8dec823faffa0a298712ed4bbd7455ebc (patch) | |
| tree | 1b58c4ffd973657457614ed46884b786559941b1 /release/release.sh | |
| parent | 03285bc58daae24870749facdb9f8ee76e06ec57 (diff) | |
| download | FreeBSD-src-7a5a99c8dec823faffa0a298712ed4bbd7455ebc.zip FreeBSD-src-7a5a99c8dec823faffa0a298712ed4bbd7455ebc.tar.gz | |
In extra_chroot_setup(), use 'uname -U' to determine OSVERSION.
Move the port build for EMBEDDEDPORTS (if set) from arm/release.sh
to release.sh.
Remove arm/release.sh.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/release.sh')
| -rwxr-xr-x | release/release.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/release/release.sh b/release/release.sh index 2db5cf3..8ff974d 100755 --- a/release/release.sh +++ b/release/release.sh @@ -257,7 +257,7 @@ extra_chroot_setup() { if [ -d ${CHROOTDIR}/usr/ports ]; then # Trick the ports 'run-autotools-fixup' target to do the right # thing. - _OSVERSION=$(sysctl -n kern.osreldate) + _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) UNAME_r=${REVISION}-${BRANCH} @@ -271,6 +271,13 @@ extra_chroot_setup() { fi fi + if [ ! -z "${EMBEDDEDPORTS}" ]; then + for _PORT in ${EMBEDDEDPORTS}; do + eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \ + BATCH=1 FORCE_PKG_REGISTER=1 install clean distclean + done + fi + return 0 } # extra_chroot_setup() |
