From b3b3642fe229a8546e869ff4c058606ddfb02f0e Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Thu, 17 Nov 2022 12:07:09 +0000
Subject: assimilate nvmutil

---
 resources/scripts/blobs/inject | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'resources/scripts/blobs/inject')

diff --git a/resources/scripts/blobs/inject b/resources/scripts/blobs/inject
index 45da8d6c..fbf5fe4d 100755
--- a/resources/scripts/blobs/inject
+++ b/resources/scripts/blobs/inject
@@ -25,24 +25,13 @@ Modify_gbe(){
 	printf "changing mac address in gbe to ${new_mac}\n"
 	_gbe_location=${CONFIG_GBE_BIN_PATH#../../}
 
-	if [ ! -d nvmutil/ ]; then
-		git clone https://notabug.org/osboot/nvmutil
-		if [ ! -d nvmutil/ ]; then
-			printf "E: could not download nvmutil"
-			exit 1
-		fi
-		(
-		cd nvmutil/
-		git reset --hard 886a5ffb0d68a1e9627b1ecb7e4ab30bf6c66c21
-		)
-	fi
-	if [ ! -f nvmutil/nvm ]; then
-		( cd nvmutil/ && make )
+	if [ ! -f util/nvmutil/nvm ]; then
+		( cd util/nvmutil/ && make )
 	fi
 
 	_gbe_tmp=$(mktemp -t gbeXXXX.bin)
 	cp ${_gbe_location} ${_gbe_tmp}
-	./nvmutil/nvm ${_gbe_tmp} setmac ${new_mac} || Error_out 'failed to modify mac address\nmake sure the mac address in the correct format'
+	./util/nvmutil/nvm ${_gbe_tmp} setmac ${new_mac} || Error_out 'failed to modify mac address\nmake sure the mac address in the correct format'
 	
 	./coreboot/default/util/ifdtool/ifdtool -i GbE:${_gbe_tmp} ${rom} -O ${rom} || exit 1
 
-- 
cgit v1.2.1