Date: Mon, 6 Nov 2017 17:59:04 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325490 - head/release Message-ID: <201711061759.vA6Hx4E1001578@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711061759.vA6Hx4E1001578>