d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include TARGET and TARGET_ARCH in chroot_arm_build_release()

Browse Source 
make(1) invocations following the OBJDIR restructuring to
ensure the output arm SoC image is in the correct directory.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
gjb 2017-11-03 18:54:25 +00:00
parent a32dac0e8d
commit 6287d0a5e0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/release.sh
View File

@ -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}