From 155ce49b17e39a12b6e3ead684a5e302416f471c Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 28 Jun 2024 21:43:23 +0100 Subject: vendor.sh: simplify modify_gbe() Signed-off-by: Leah Rowe --- include/vendor.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/vendor.sh b/include/vendor.sh index 22d5a76d..f996e377 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -420,19 +420,12 @@ inject() modify_gbe() { - printf "changing mac address in gbe to $new_mac\n" - [ -z "$CONFIG_GBE_BIN_PATH" ] && \ - err "modify_gbe: $board: CONFIG_GBE_BIN_PATH not set" + chkvars CONFIG_GBE_BIN_PATH - _gbe_location=${CONFIG_GBE_BIN_PATH##*../} - [ -f "$_gbe_location" ] || \ - err "modify_gbe: $_gbe_location points to missing file" + e "${CONFIG_GBE_BIN_PATH##*../}" f n && $err "missing gbe file" x_ make -C util/nvmutil - _gbe_tmp=$(mktemp -t gbeXXXX.bin) - x_ cp "$_gbe_location" "$_gbe_tmp" - x_ "$nvmutil" "$_gbe_tmp" setmac "$new_mac" - x_ "${ifdtool}" -i GbE:"$_gbe_tmp" "$1" -O "$1" - - x_ rm -f "$_gbe_tmp" + x_ cp "${CONFIG_GBE_BIN_PATH##*../}" "$TMPDIR/gbe" + x_ "$nvmutil" "$TMPDIR/gbe" setmac "$new_mac" + x_ "$ifdtool" -i GbE:"$TMPDIR/gbe" "$1" -O "$1" } -- cgit v1.2.1