Revert "mk: simplify release=n handling"

This reverts commit 8c50373d5977d630626b14719977dc51a3ae2bdf.

2 files changed, 17 insertions, 7 deletions

diff --git a/include/fw/rom.sh b/include/fw/rom.sh
index 9047dd44..dc7ccd6f 100644
--- a/include/fw/rom.sh
+++ b/include/fw/rom.sh
@@ -57,6 +57,9 @@ mkpayload_grub()
 
 corebootpremake()
 {
+	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
+		return 0
+
 	forx 'check_coreboot_util %s' cbfstool ifdtool
 
 	printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \
@@ -96,11 +99,17 @@ check_coreboot_util()
 
 coreboot_pad_one_byte()
 {
+	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
+		return 0
+
 	pad_one_byte "$srcdir/build/coreboot.rom"
 }
 
 mkcorebootbin()
 {
+	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
+		return 0
+
 	for y in "$defscan"/*; do
 		buildcfg="$y"
 		mkcorebootbin_real
@@ -374,6 +383,11 @@ cbfs()
 
 mkcoreboottar()
 {
+	if [ "$target" = "$tree" ] || [ "$XBMK_RELEASE" != "y" ] || \
+	    [ "$release" = "n" ]; then
+		return 0
+	fi
+
 	mkrom_tarball "bin/$target"
 	x_ "$mk" inject "bin/${relname}_${target}.tar.xz" nuke
 }
diff --git a/mk b/mk
index 75ddea17..35e10f8d 100755
--- a/mk
+++ b/mk
@@ -201,9 +201,6 @@ handle_target()
 	configure_target "$target_dir" && \
 		$if_not_fetch x_ handle_buildcfg
 
-	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
-		return 0
-
 	# if using configs, we never build from the master target
 	[ "$noconfig" != "y" ] && [ "$tree" = "$target" ] && \
 		return 0
@@ -222,10 +219,6 @@ configure_target()
 
 	# override target/tree specific variables from per-target config:
 	while [ -z "$rev" ] && try_target_config; do :; done
-
-	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
-		return 1
-
 	[ -z "$tree" ] && \
 		err "$project/$target: tree unset" configure_target "$@"
 
@@ -245,6 +238,9 @@ configure_target()
 	# filename in srcdir when copying e.g. coreboot defconfig -> .config
 	[ -z "$cfgname" ] && cfgname="$cfgname_default" # e.g. $srcdir/.config
 
+	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \
+		return 1
+
 	mdir="$xbmkpwd/config/submodule/$project/$tree"
 
 	[ -f "CHANGELOG" ] && return 0 # disable fetching on release archives