aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2019-06-17 22:53:39 +0000
committerGlen Barber <gjb@FreeBSD.org>2019-06-17 22:53:39 +0000
commitc1f6499260b4fb2d05da29e5246e1c26a7222a69 (patch)
tree4c95f13ac22f79f308d3ff4d1199a1d1909501f4
parentb6bb4d1e1917ac1d705e3d14cb06b3abb235f5f8 (diff)
downloadsrc-c1f6499260b4fb2d05da29e5246e1c26a7222a69.tar.gz
src-c1f6499260b4fb2d05da29e5246e1c26a7222a69.zip
Fix passing ${CONF_FILES} (which contains MAKE_CONF and
SRC_CONF, __MAKE_CONF and SRCCONF, respectively) through to arm_install_base() and chroot_arm_build_release(). This prevents failures when the target image is intended to be build with make.conf(5) and src.conf(5) overrides, which are correctly handled for non-embedded image builds. Reported and tested by: Daniel Engberg PR: 238615 MFC after: 3 days Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=349160
-rwxr-xr-xrelease/release.sh1
-rw-r--r--release/tools/arm.subr2
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