diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-09-16 05:52:06 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-09-16 05:52:06 +0100 |
| commit | 113dac006f65a468a09570e8dc9cde94cde3a7bd (patch) | |
| tree | 757e3dd1545a268663bba2be6e325e079512da17 /include/fw | |
| parent | 88887c0163c85321bd8e8e1ce7acc9cae8400a34 (diff) | |
variable ./mk location, based on user input
when calling ./mk, or from PATH, an absolute path
is created to ./mk
this will likely be different than mk, but it might
be a different script. perhaps the operator is making
a copy of the mk script temporarily - obviously not
advised, no, but here we have a problem because then
lbmk is still running ./mk everywhere
run arg0 instead, now called "mk"
./mk is still hardcoded in release.sh, because we
do need to make sure we're using the right script
there
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/fw')
| -rw-r--r-- | include/fw/inject.sh | 4 | ||||
| -rw-r--r-- | include/fw/rom.sh | 4 | ||||
| -rw-r--r-- | include/fw/vendor.sh | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/fw/inject.sh b/include/fw/inject.sh index 29584e0a..77af9b0a 100644 --- a/include/fw/inject.sh +++ b/include/fw/inject.sh @@ -106,7 +106,7 @@ check_target() [ -z "$tree" ] && \ err "tree unset in '$boarddir/target.cfg'" "check_target" "$@" - x_ ./mk -d coreboot "$tree" + x_ "$mk" -d coreboot "$tree" ifdtool="elf/coreboot/$tree/ifdtool" @@ -117,7 +117,7 @@ check_target() patch_release() { [ "$nuke" != "nuke" ] && \ - x_ ./mk download "$board" + x_ "$mk" download "$board" has_hashes="n" tmpromdir="$tmpromdel/bin/$board" diff --git a/include/fw/rom.sh b/include/fw/rom.sh index adaac8a0..4c4e475e 100644 --- a/include/fw/rom.sh +++ b/include/fw/rom.sh @@ -74,7 +74,7 @@ corebootpremake() err "!mk $srcdir .coreboot-version" "corebootpremake" "$@" [ -z "$mode" ] && [ "$target" != "$tree" ] && \ - x_ ./mk download "$target"; : + x_ "$mk" download "$target"; : } cook_coreboot_config() @@ -455,5 +455,5 @@ mkcoreboottar() fi mkrom_tarball "bin/$target" - x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke + x_ "$mk" inject "bin/${relname}_${target}.tar.xz" nuke } diff --git a/include/fw/vendor.sh b/include/fw/vendor.sh index 7c8f9f2c..fc6d1593 100644 --- a/include/fw/vendor.sh +++ b/include/fw/vendor.sh @@ -222,7 +222,7 @@ extract_intel_me() "extract_intel_me" "$@" fi - x_ ./mk -f deguard + x_ "$mk" -f deguard fi set +u +e @@ -455,20 +455,20 @@ bootstrap() [ "$XBMKmecleaner" = "y" ] && \ mecleaner="$xbmkpwd/src/me_cleaner/me_cleaner.py" - x_ ./mk -f coreboot "${cbdir##*/}" - x_ ./mk -f me_cleaner + x_ "$mk" -f coreboot "${cbdir##*/}" + x_ "$mk" -f me_cleaner - x_ ./mk -b bios_extract - x_ ./mk -b biosutilities - x_ ./mk -b uefitool - x_ ./mk -b libarchive # for bsdtar and bsdunzip + x_ "$mk" -b bios_extract + x_ "$mk" -b biosutilities + x_ "$mk" -b uefitool + x_ "$mk" -b libarchive # for bsdtar and bsdunzip [ -d "${kbc1126_ec_dump%/*}" ] && \ x_ make -C "$cbdir/util/kbc1126" if [ -n "$MRC_refcode_cbtree" ]; then cbfstoolref="elf/coreboot/$MRC_refcode_cbtree/cbfstool" - x_ ./mk -d coreboot "$MRC_refcode_cbtree"; : + x_ "$mk" -d coreboot "$MRC_refcode_cbtree"; : fi } |