diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2017-11-06 17:59:04 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2017-11-06 17:59:04 +0000 |
| commit | bb0c3a6b0319a8a63abbe65780f5ccbc900ab00d (patch) | |
| tree | da0eda2da39a5947c5e15a0ecb24c5040a742394 /release/release.sh | |
| parent | 333260daf5e2e911cfe5650da0acfe88fefb8178 (diff) | |
| download | src-test2-bb0c3a6b0319a8a63abbe65780f5ccbc900ab00d.tar.gz src-test2-bb0c3a6b0319a8a63abbe65780f5ccbc900ab00d.zip | |
Specify WITH_UNIFIED_OBJDIR in chroot_arm_build_release() to
ensure the output image is created in the correct .OBJDIR.
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=325490
Diffstat (limited to 'release/release.sh')
| -rwxr-xr-x | release/release.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/release/release.sh b/release/release.sh index 0d5ae73d203b..18ec210b78f6 100755 --- a/release/release.sh +++ b/release/release.sh @@ -350,9 +350,6 @@ chroot_build_release() { # chroot_arm_build_release(): Create arm SD card image. chroot_arm_build_release() { load_target_env - MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}" - MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" - eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release obj case ${EMBEDDED_TARGET} in arm|arm64) if [ -e "${RELENGDIR}/tools/arm.subr" ]; then @@ -363,11 +360,14 @@ chroot_arm_build_release() { ;; esac [ ! -z "${RELEASECONF}" ] && . "${RELEASECONF}" - WORLDDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V WORLDDIR)" - OBJDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V .OBJDIR)" - DESTDIR="${OBJDIR}/${KERNEL}" - IMGBASE="${CHROOTDIR}/${OBJDIR}/${KERNEL}.img" - OSRELEASE="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release \ + export MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}" + export MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" + eval chroot ${CHROOTDIR} env WITH_UNIFIED_OBJDIR=1 make ${MAKE_FLAGS} -C /usr/src/release obj + export WORLDDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V WORLDDIR)" + export OBJDIR="$(eval chroot ${CHROOTDIR} env WITH_UNIFIED_OBJDIR=1 make ${MAKE_FLAGS} -C /usr/src/release -V .OBJDIR)" + export DESTDIR="${OBJDIR}/${KERNEL}" + export IMGBASE="${CHROOTDIR}/${OBJDIR}/${KERNEL}.img" + export OSRELEASE="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release \ TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ -V OSRELEASE)" chroot ${CHROOTDIR} mkdir -p ${DESTDIR} |