diff options
Diffstat (limited to 'include/fw')
| -rw-r--r-- | include/fw/inject.sh | 7 | ||||
| -rw-r--r-- | include/fw/rom.sh | 5 | ||||
| -rw-r--r-- | include/fw/vendor.sh | 5 |
3 files changed, 4 insertions, 13 deletions
diff --git a/include/fw/inject.sh b/include/fw/inject.sh index 77af9b0a..ca5b84b7 100644 --- a/include/fw/inject.sh +++ b/include/fw/inject.sh @@ -24,8 +24,7 @@ inject() archive="$1"; new_mac="xx:xx:xx:xx:xx:xx" - nuke="" - xchanged="" + eval "`newvar nuke xchanged`" [ $# -gt 1 ] && case "$2" in nuke) @@ -169,9 +168,7 @@ modify_mac() x_ cp "${CONFIG_GBE_BIN_PATH##*../}" "$xbtmp/gbe" if [ -n "$new_mac" ] && [ "$new_mac" != "restore" ]; then - x_ make -C util/nvmutil clean - x_ make -C util/nvmutil - + forx 'x_ make -C util/nvmutil %s' clean nvmutil x_ "$nvmutil" "$xbtmp/gbe" setmac "$new_mac" fi diff --git a/include/fw/rom.sh b/include/fw/rom.sh index 4d2b852a..5f45c77e 100644 --- a/include/fw/rom.sh +++ b/include/fw/rom.sh @@ -131,10 +131,7 @@ mkcorebootbin() return 0 $if_not_dry_build \ - check_coreboot_util cbfstool - - $if_not_dry_build \ - check_coreboot_util ifdtool + forx 'check_coreboot_util %s' cbfstool ifdtool for y in "$target_dir/config"/*; do defconfig="$y" diff --git a/include/fw/vendor.sh b/include/fw/vendor.sh index f2556d68..41c51e09 100644 --- a/include/fw/vendor.sh +++ b/include/fw/vendor.sh @@ -443,10 +443,7 @@ bootstrap() 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 + forx 'x_ \"$mk\" -b %s' bios_extract biosutilities uefitool libarchive [ -d "${kbc1126_ec_dump%/*}" ] && \ x_ make -C "$cbdir/util/kbc1126" |