Revert "mk: simplify release=n handling"

This reverts commit 8c50373d5977d630626b14719977dc51a3ae2bdf.

1 files changed, 14 insertions, 0 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
 }