diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2019-06-17 22:53:39 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2019-06-17 22:53:39 +0000 |
| commit | c1f6499260b4fb2d05da29e5246e1c26a7222a69 (patch) | |
| tree | 4c95f13ac22f79f308d3ff4d1199a1d1909501f4 /release | |
| parent | b6bb4d1e1917ac1d705e3d14cb06b3abb235f5f8 (diff) | |
Notes
Diffstat (limited to 'release')
| -rwxr-xr-x | release/release.sh | 1 | ||||
| -rw-r--r-- | release/tools/arm.subr | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/release/release.sh b/release/release.sh index cff917949cf9..1e7e86f330fa 100755 --- a/release/release.sh +++ b/release/release.sh @@ -388,6 +388,7 @@ chroot_arm_build_release() { [ ! -z "${RELEASECONF}" ] && . "${RELEASECONF}" export MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}" export MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" + export MAKE_FLAGS="${MAKE_FLAGS} ${CONF_FILES}" 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)" diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 5b024334188e..7deee7546544 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -166,7 +166,7 @@ arm_install_base() { TARGET=${EMBEDDED_TARGET} \ TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \ - installworld installkernel distribution + ${CONF_FILES} installworld installkernel distribution chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos arm_create_user |