aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2017-11-03 18:54:25 +0000
committerGlen Barber <gjb@FreeBSD.org>2017-11-03 18:54:25 +0000
commit0dd40b17a877aac8031e289ad4c4188a2306b684 (patch)
tree4894ab7daec498204f1a9e9c8838c01497d7b15a /release/release.sh
parented3b30599370432f6ac501e36099f597f5999d27 (diff)
downloadsrc-0dd40b17a877aac8031e289ad4c4188a2306b684.tar.gz
src-0dd40b17a877aac8031e289ad4c4188a2306b684.zip
Include TARGET and TARGET_ARCH in chroot_arm_build_release()
make(1) invocations following the OBJDIR restructuring to ensure the output arm SoC image is in the correct directory. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=325366
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/release/release.sh b/release/release.sh
index 177c885b885c..0d5ae73d203b 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -350,7 +350,9 @@ chroot_build_release() {
# chroot_arm_build_release(): Create arm SD card image.
chroot_arm_build_release() {
load_target_env
- eval chroot ${CHROOTDIR} make -C /usr/src/release obj
+ 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
@@ -361,11 +363,11 @@ chroot_arm_build_release() {
;;
esac
[ ! -z "${RELEASECONF}" ] && . "${RELEASECONF}"
- WORLDDIR="$(eval chroot ${CHROOTDIR} make -C /usr/src/release -V WORLDDIR)"
- OBJDIR="$(eval chroot ${CHROOTDIR} make -C /usr/src/release -V .OBJDIR)"
+ 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 -C /usr/src/release \
+ 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}