From d28bca7306267c8d0c7e3a8158a2c21a2be6a4d8 Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Sun, 12 Jan 2025 22:06:33 -0800 Subject: [PATCH 1/3] Fix buildroot when launched from install script --- bin/wally-tool-chain-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh index 35578d008..c032e899f 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -126,6 +126,8 @@ fi # Determine script directory to locate related scripts dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +WALLY=$(dirname "$dir") +export WALLY # Get Linux distro and version source "${dir}"/wally-distro-check.sh From b3796fc81094b7bb21be46f847a9040ee0b8d41f Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Mon, 13 Jan 2025 10:56:06 -0800 Subject: [PATCH 2/3] Allow buildroot to be compiled as root --- bin/wally-tool-chain-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh index c032e899f..11da9d3d0 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -473,7 +473,7 @@ if [ ! "$no_buidroot" ]; then fi cd "$dir"/../linux if [ ! -e "$RISCV"/buildroot ]; then - make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ] + FORCE_UNSAFE_CONFIGURE=1 make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ] echo -e "${SUCCESS_COLOR}Buildroot successfully installed and Linux testvectors created!${ENDC}" elif [ ! -e "$RISCV"/linux-testvectors ]; then echo -e "${OK_COLOR}Buildroot already exists, but Linux testvectors are missing. Generating them now.${ENDC}" From af99d2cd80f0f532a835ca56413c4e97bb04760d Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Thu, 16 Jan 2025 22:14:43 -0800 Subject: [PATCH 3/3] Add comment explaining FORCE_UNSAFE_CONFIGURE [skip ci] --- bin/wally-tool-chain-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh index 11da9d3d0..dbe60a007 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -473,7 +473,7 @@ if [ ! "$no_buidroot" ]; then fi cd "$dir"/../linux if [ ! -e "$RISCV"/buildroot ]; then - FORCE_UNSAFE_CONFIGURE=1 make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ] + FORCE_UNSAFE_CONFIGURE=1 make 2>&1 | logger $STATUS; [ "${PIPESTATUS[0]}" == 0 ] # FORCE_UNSAFE_CONFIGURE is needed to allow buildroot to compile when run as root echo -e "${SUCCESS_COLOR}Buildroot successfully installed and Linux testvectors created!${ENDC}" elif [ ! -e "$RISCV"/linux-testvectors ]; then echo -e "${OK_COLOR}Buildroot already exists, but Linux testvectors are missing. Generating them now.${ENDC}"