Attachment 223309 Details for Bug 254319 – release.sh patch to prevent MAKE_CONF and SRC_CONF settings in release.conf from affecting chroot build

[patch] release.sh patch to prevent MAKE_CONF and SRC_CONF settings in release.conf from affecting chroot build

release-conf.patch (text/plain), 1.15 KB, created by Don Lewis on 2021-03-15 21:52:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2021-03-15 21:52:40 UTC

Size: 1.15 KB

patch

obsolete

>diff --git a/release/release.sh b/release/release.sh
>index 3d7612ef6b8..bc5c2d423bf 100755
>--- a/release/release.sh
>+++ b/release/release.sh
>@@ -170,6 +170,7 @@ env_check() {
> 	# The aggregated build-time flags based upon variables defined within
> 	# this file, unless overridden by release.conf.  In most cases, these
> 	# will not need to be changed.
>+	NOCONF_FILES="__MAKE_CONF=/dev/null SRCCONF=/dev/null"
> 	CONF_FILES="__MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF}"
> 	if [ -n "${TARGET}" ] && [ -n "${TARGET_ARCH}" ]; then
> 		ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
>@@ -194,9 +195,9 @@ env_check() {
> 
> 	CHROOT_MAKEENV="${CHROOT_MAKEENV} \
> 		MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
>-	CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
>-	CHROOT_IMAKEFLAGS="${WORLD_FLAGS} ${CONF_FILES}"
>-	CHROOT_DMAKEFLAGS="${WORLD_FLAGS} ${CONF_FILES}"
>+	CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${NOCONF_FILES}"
>+	CHROOT_IMAKEFLAGS="${WORLD_FLAGS} ${NOCONF_FILES}"
>+	CHROOT_DMAKEFLAGS="${WORLD_FLAGS} ${NOCONF_FILES}"
> 	RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} \
> 		${CONF_FILES}"
> 	RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \

Actions: View | Diff

Attachments on bug 254319: 223309