From 839ef680cd8f25650d8fb59a3e6fe6bf3f84786b Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Thu, 16 May 2024 03:56:52 +0100
Subject: lbmk: allow easier sync with cbmk

an equivalent change has been made in cbmk.

certain lbmk-specific variable names have been made
generic, with certain functions and other variables
moved around.

i maintain sync between libreboot and canoeboot, where
both projects can have the same behaviours, and most of
the merge conflicts have to do with variable names
containing "LBMK", "lbmk", "cbmk" or "CBMK", or
indeed "canoeboot" and "libreboot"

LBMK/lbmk/CBMK/cbmk variables between canoeboot and
libreboot now contain the string XBMK/xbmk

it should now be *much* easier to merge build system
changes between lbmk and cbmk.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 script/roms | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'script')

diff --git a/script/roms b/script/roms
index ac3d28ef..7c181c36 100755
--- a/script/roms
+++ b/script/roms
@@ -61,14 +61,14 @@ main()
 	fi
 
 	bstr="directories"
-	[ "$lbmk_release" = "y" ] && bstr="tarballs"
+	[ "$xbmk_release" = "y" ] && bstr="tarballs"
 
 	[ -z "${targets}" ] && $err "No ROM images were compiled"
 	printf "\nROM images available in these %s:\n" "$bstr"
 	eval "printf \"${targets}\""
 	printf "^^ ROM images available in these %s.\n\n" "$bstr"
 
-	[ "$lbmk_release" = "y" ] && \
+	[ "$xbmk_release" = "y" ] && \
 		printf "Always run the inject command on release images!\n"
 	printf "DO NOT flash images from elf/ - please use bin/ instead.\n"
 }
@@ -99,7 +99,7 @@ handle_serprog()
 			done
 	fi
 
-	[ "$lbmk_release" = "y" ] && mktar_release "bin/serprog_$1"; return 0
+	[ "$xbmk_release" = "y" ] && mktar_release "bin/serprog_$1"; return 0
 }
 
 build_rp2040_rom()
@@ -144,7 +144,7 @@ handle_coreboot_target()
 
 	configure_target
 	[ "$board" = "$tree" ] && return 0
-	if [ "$lbmk_release" = "y" ] && [ "$release" = "n" ]; then
+	if [ "$xbmk_release" = "y" ] && [ "$release" = "n" ]; then
 		printf "Target '%s' disabled for release.\n" "$board"
 		return 0
 	fi
@@ -153,8 +153,8 @@ handle_coreboot_target()
 	build_target_mainboard
 
 	[ -d "bin/${board}" ] || return 0
-	[ "$lbmk_release" = "y" ] || targets="* bin/${board}\n${targets}"
-	[ "$lbmk_release" = "y" ] || return 0
+	[ "$xbmk_release" = "y" ] || targets="* bin/${board}\n${targets}"
+	[ "$xbmk_release" = "y" ] || return 0
 
 	targets="* bin/${relname}_$board.tar.xz\n$targets"
 	mktar_release "bin/$board"
@@ -466,7 +466,7 @@ moverom()
 
 	x_ mkdir -p "${2%/*}"
 	x_ cp "$1" "$2"
-	[ "$lbmk_release" = "y" ] || return 0
+	[ "$xbmk_release" = "y" ] || return 0
 
 	mksha512sum "${2}" "vendorhashes"
 	x_ ./vendor inject -r "${2}" -b "$board" -n nuke
-- 
cgit v1.2.1