From ab885287bbd1e6d07c92426fb8a6bf6657d0090f Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Fri, 26 Jul 2024 11:46:09 -0700
Subject: [PATCH] Actually fix buildroot makefile

---
 linux/Makefile                            | 28 +++++++++++++++--------
 linux/testvector-generation/genInitMem.sh |  4 ++--
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/linux/Makefile b/linux/Makefile
index f2ad871fb..6126db7c5 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -6,6 +6,13 @@ DIS := ${IMAGES}/disassembly
 BRPACKAGES := $(WALLYLINUX)/buildroot-packages
 BR2023 := $(WALLYLINUX)/buildroot-config-src/buildroot-2023.05.1
 
+# set sudo if needed depending on $RISCV
+ifeq ($(shell mkdir -p $(RISCV)/.test > /dev/null 2>&1 ; echo $$?), 0)
+	SUDO :=
+else
+	SUDO := sudo
+endif
+
 # Buildroot Config Stuff
 WALLYBOARDSRC := $(WALLYLINUX)/buildroot-config-src/wally
 WALLYBOARD := $(BUILDROOT)/board/wally
@@ -16,7 +23,7 @@ FPGA_AXI_SDC := ${WALLYLINUX}/buildroot-packages/fpga-axi-sdc
 DRIVER := ${PACKAGE_SOURCE}/fpga-axi-sdc.c
 PATCHFILE := $(BRPACKAGES)/package-2023.05.1.patch
 
-# Device tree files 
+# Device tree files
 DTS ?= $(shell find devicetree -type f -regex ".*\.dts" | sort)
 DTB := $(DTS:%.dts=%.dtb)
 DTB := $(foreach name, $(DTB), $(IMAGES)/$(shell basename $(name)))
@@ -31,23 +38,26 @@ OBJDUMPS := $(foreach name, $(OBJDUMPS), $(DIS)/$(name).objdump)
 all: check_write_permissions clean download Image disassemble install dumptvs
 
 check_write_permissions:
-	@mkdir -p $(RISCV)/.test || \
-		(echo "ERROR: Cannot write to '$(RISCV)'." \
-		"Make sure you have write permissions (you may need to run as sudo).'" >&2 \
+ifeq ($(SUDO), sudo)
+	@echo "Cannot write to '$(RISCV)'." \
+		"Using sudo (you may be prompted for your password several times throughout the install)"
+endif
+	@$(SUDO) mkdir -p $(RISCV)/.test || \
+		(echo "ERROR: Still unable to write to '$(RISCV)'." >&2 \
 		&& exit 1)
-	@rm -r $(RISCV)/.test
+	@$(SUDO) rm -r $(RISCV)/.test
 
 Image:
 	bash -c "unset LD_LIBRARY_PATH; make -C $(BUILDROOT) --jobs ${shell nproc --ignore 1};"
 	$(MAKE) generate
 
 install: check_write_permissions
-	rm -rf $(RISCV)/$(BUILDROOT)
-	mv $(BUILDROOT) $(RISCV)/$(BUILDROOT)
+	$(SUDO) rm -rf $(RISCV)/$(BUILDROOT)
+	$(SUDO) mv $(BUILDROOT) $(RISCV)/$(BUILDROOT)
 
 dumptvs: check_write_permissions
-	mkdir -p $(RISCV)/linux-testvectors 
-	cd testvector-generation; ./genInitMem.sh
+	$(SUDO) mkdir -p $(RISCV)/linux-testvectors
+	cd testvector-generation; $(SUDO) ./genInitMem.sh
 
 generate: $(DTB) $(IMAGES)
 
diff --git a/linux/testvector-generation/genInitMem.sh b/linux/testvector-generation/genInitMem.sh
index 61f570482..ee565cd3c 100755
--- a/linux/testvector-generation/genInitMem.sh
+++ b/linux/testvector-generation/genInitMem.sh
@@ -26,9 +26,9 @@ fi
 
 echo "Launching QEMU in replay mode!"
 (qemu-system-riscv64 \
--M virt -m 256M -dtb $DEVICE_TREE \
+-M virt -m 256M -dtb "$DEVICE_TREE" \
 -nographic \
--bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \
+-bios "$imageDir"/fw_jump.elf -kernel "$imageDir"/Image -append "root=/dev/vda ro" -initrd "$imageDir"/rootfs.cpio \
 -gdb tcp::$tcpPort -S) \
 & riscv64-unknown-elf-gdb --quiet \
 -ex "set pagination off" \