Author: gjb
Date: Mon Nov 6 17:59:04 2017
New Revision: 325490
URL: https://svnweb.freebsd.org/changeset/base/325490
Log:
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
Modified:
head/release/release.sh
Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh Mon Nov 6 17:27:50 2017 (r325489)
+++ head/release/release.sh Mon Nov 6 17:59:04 2017 (r325490)
@@ -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}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
