From 88c9534a2caf04a50be4e0381fc914f0fee88a2f Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Fri, 26 Jul 2024 17:20:56 -0700
Subject: [PATCH] Updates to linux testvector generation

---
 linux/Makefile                            | 10 +++-------
 linux/testvector-generation/genInitMem.sh |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/linux/Makefile b/linux/Makefile
index 06b42e3fb..6decffe7e 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -59,7 +59,7 @@ install: check_write_permissions
 
 dumptvs: check_write_permissions
 	$(SUDO) mkdir -p $(RISCV)/linux-testvectors
-	cd testvector-generation; $(SUDO) ./genInitMem.sh
+	cd testvector-generation; ./genInitMem.sh
 	@echo "Testvectors successfully generated."
 
 generate: $(DTB) $(IMAGES)
@@ -89,16 +89,12 @@ disassemble:
 	-cpio -i -D $(BUILDROOT)/output/images/disassembly/rootfs < $(BUILDROOT)/output/images/rootfs.cpio
 	@echo "Disassembly successfully completed."
 
-
-$(DIS)/%.objdump: SHELL:=/bin/bash
 $(DIS)/%.objdump: $(IMAGES)/%.elf
-	source ../setup.sh && \
-	riscv64-unknown-elf-objdump -DS $< >> $@ && \
+	riscv64-unknown-elf-objdump -DS $< >> $@
 	extractFunctionRadix.sh $@
 
 $(DIS)/%.objdump: $(IMAGES)/%
-	source ../setup.sh && \
-	riscv64-unknown-elf-objdump -S $< >> $@ && \
+	riscv64-unknown-elf-objdump -S $< >> $@
 	extractFunctionRadix.sh $@
 
 $(IMAGES)/vmlinux:
diff --git a/linux/testvector-generation/genInitMem.sh b/linux/testvector-generation/genInitMem.sh
index ee565cd3c..1274a4240 100755
--- a/linux/testvector-generation/genInitMem.sh
+++ b/linux/testvector-generation/genInitMem.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 tcpPort=1235
 imageDir=$RISCV/buildroot/output/images
 tvDir=$RISCV/linux-testvectors