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

put coreboot utils in elf/coreboot/TREE

Browse Source 
not elf/UTIL/TREE

This way, they are automatically deleted when a tree
has to be re-built.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-27 10:11:42 +01:00
parent b77154640d
commit dc6996252a
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/inject.sh
+2 -2
View File
@@ -6,7 +6,7 @@
cbcfgsdir="config/coreboot" cbcfgsdir="config/coreboot"
tmpromdel="$XBMK_CACHE/DO_NOT_FLASH" tmpromdel="$XBMK_CACHE/DO_NOT_FLASH"
nvm="util/nvmutil/nvm" nvm="util/nvmutil/nvm"
ifdtool="elf/ifdtool/default/ifdtool" ifdtool="elf/coreboot/default/ifdtool"
cv="CONFIG_GBE_BIN_PATH" cv="CONFIG_GBE_BIN_PATH"
[ -n "$cvxbmk" ] && cv="$cv $cvxbmk" [ -n "$cvxbmk" ] && cv="$cv $cvxbmk"
@@ -77,7 +77,7 @@ check_target()
eval "`setcfg "$boarddir/target.cfg"`" eval "`setcfg "$boarddir/target.cfg"`"
chkvars tree && x_ ./mk -d coreboot "$tree" chkvars tree && x_ ./mk -d coreboot "$tree"
ifdtool="elf/ifdtool/$tree/ifdtool" ifdtool="elf/coreboot/$tree/ifdtool"
[ -n "$IFD_platform" ] && ifdprefix="-p $IFD_platform"; : [ -n "$IFD_platform" ] && ifdprefix="-p $IFD_platform"; :
} }
include/lib.sh
+2 -2
View File
@@ -4,8 +4,8 @@
# Copyright (c) 2020-2025 Leah Rowe <leah@libreboot.org> # Copyright (c) 2020-2025 Leah Rowe <leah@libreboot.org>
# Copyright (c) 2025 Alper Nebi Yasak <alpernebiyasak@gmail.com> # Copyright (c) 2025 Alper Nebi Yasak <alpernebiyasak@gmail.com>
cbfstool="elf/cbfstool/default/cbfstool" cbfstool="elf/coreboot/default/cbfstool"
rmodtool="elf/cbfstool/default/rmodtool" rmodtool="elf/coreboot/default/rmodtool"
remkdir() remkdir()
{ {
include/rom.sh
+4 -4
View File
@@ -56,10 +56,10 @@ corebootpremake()
check_coreboot_util() check_coreboot_util()
{ {
[ "$badhash" = "y" ] && x_ rm -f "elf/$1/$tree/$1" [ "$badhash" = "y" ] && x_ rm -f "elf/coreboot/$tree/$1"
e "elf/$1/$tree/$1" f && return 0 e "elf/coreboot/$tree/$1" f && return 0
utilelfdir="elf/$1/$tree" utilelfdir="elf/coreboot/$tree"
utilsrcdir="src/coreboot/$tree/util/$1" utilsrcdir="src/coreboot/$tree/util/$1"
utilmode="" && [ -n "$mode" ] && utilmode="clean" utilmode="" && [ -n "$mode" ] && utilmode="clean"
@@ -85,7 +85,7 @@ mkcorebootbin()
displaymode="${initmode##*_}" displaymode="${initmode##*_}"
[ "$displaymode" = "$initmode" ] && displaymode="" # "normal" config [ "$displaymode" = "$initmode" ] && displaymode="" # "normal" config
initmode="${initmode%%_*}" initmode="${initmode%%_*}"
cbfstool="elf/cbfstool/$tree/cbfstool" cbfstool="elf/coreboot/$tree/cbfstool"
[ -z "$payload_uboot" ] || [ "$payload_uboot" = "amd64" ] || \ [ -z "$payload_uboot" ] || [ "$payload_uboot" = "amd64" ] || \
[ "$payload_uboot" = "i386" ] || [ "$payload_uboot" = "arm64" ] \ [ "$payload_uboot" = "i386" ] || [ "$payload_uboot" = "arm64" ] \
include/vendor.sh
+2 -2
View File
@@ -270,8 +270,8 @@ bootstrap()
cbdir="src/coreboot/$tree" cbdir="src/coreboot/$tree"
mecleaner="$xbmkpwd/$cbdir/util/me_cleaner/me_cleaner.py" mecleaner="$xbmkpwd/$cbdir/util/me_cleaner/me_cleaner.py"
kbc1126_ec_dump="$xbmkpwd/$cbdir/util/kbc1126/kbc1126_ec_dump" kbc1126_ec_dump="$xbmkpwd/$cbdir/util/kbc1126/kbc1126_ec_dump"
cbfstool="elf/cbfstool/$tree/cbfstool" cbfstool="elf/coreboot/$tree/cbfstool"
rmodtool="elf/cbfstool/$tree/rmodtool" rmodtool="elf/coreboot/$tree/rmodtool"
x_ ./mk -f coreboot "${cbdir##*/}" x_ ./mk -f coreboot "${cbdir##*/}"
fx_ "x_ ./mk -b" printf "uefitool\nbiosutilities\nbios_extract\n" fx_ "x_ ./mk -b" printf "uefitool\nbiosutilities\nbios_extract\n"