summaryrefslogtreecommitdiff
path: root/include/lib.sh
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-06 21:45:53 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-06 21:51:37 +0100
commitc0822ac458fc7b0f2630c1cff208bd5066efbc6b (patch)
tree146d96acaffa1c1288598481ae37420dbed436ee /include/lib.sh
parentd1ba085153efadaef9bc124efd043c06658ab969 (diff)
put coreboot utils in elf/, not cbutils/
one directory per util, under elf/ e.g. elf/cbfstool/ further split by tree name, e.g.: elf/cbfstool/default/ elf/cbfstool/foo/ Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/lib.sh')
-rwxr-xr-xinclude/lib.sh19
1 files changed, 12 insertions, 7 deletions
diff --git a/include/lib.sh b/include/lib.sh
index f4214e27..eed75e2a 100755
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -8,8 +8,8 @@ export LC_ALL=C
tmpdir_was_set="y"
cbdir="src/coreboot/default"
-ifdtool="cbutils/default/ifdtool"
-cbfstool="cbutils/default/cbfstool"
+ifdtool="elf/ifdtool/default/ifdtool"
+cbfstool="elf/cbfstool/default/cbfstool"
tmpgit="$PWD/tmp/gitclone"
grubdata="config/data/grub"
err="err_"
@@ -157,11 +157,16 @@ check_defconfig()
handle_coreboot_utils()
{
for util in cbfstool ifdtool; do
- x_ make -C "src/coreboot/$1/util/$util"
- [ -z "$mode" ] && [ ! -f "cbutils/$1/$util" ] && \
- x_ mkdir -p "cbutils/$1" && \
- x_ cp "src/coreboot/$1/util/$util/$util" "cbutils/$1"
- [ -z "$mode" ] || x_ rm -Rf "cbutils/$1"
+ utilelfdir="elf/$util/$1"
+ utilsrcdir="src/coreboot/$1/util/$util"
+
+ utilmode=""
+ [ -z "$mode" ] || utilmode="clean"
+ x_ make -C "$utilsrcdir" $utilmode
+ [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \
+ x_ mkdir -p "$utilelfdir" && \
+ x_ cp "$utilsrcdir/$util" "elf/$util/$1"
+ [ -z "$mode" ] || x_ rm -Rf "$utilelfdir"
done
}