coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 14:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

lbmk: allow easier sync with cbmk

Browse Source 
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>
This commit is contained in:
Leah Rowe
2024-05-16 03:56:52 +01:00
parent 885fcebd81
commit 839ef680cd
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/roms
+7 -7
View File
@@ -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