From ddad73b0b47b0b29b1b63f194c06b69686d08a93 Mon Sep 17 00:00:00 2001
From: "Jason D. McCormick" <jason@mfamily.org>
Date: Sun, 1 Dec 2024 12:09:33 -0500
Subject: [PATCH 1/2] generate_board_config.py needs the basic config

---
 src/build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/build b/src/build
index 8822486e..c7d75cfb 100755
--- a/src/build
+++ b/src/build
@@ -8,6 +8,11 @@ set -x
 
 define(){ IFS='\n' read -r -d '' ${1} || true; }
 
+# Source in dist config to seed generate_board_config.py
+# but will then be overwritten ${CUSTOM_PI_OS_PATH}/config for
+# 'final' configuration
+source ${DIST_PATH}/config
+
 define SCRIPT <<'EOF'
 BUILD_SCRIPT_PATH=$(dirname $(realpath -s $BASH_SOURCE))
 export EXTRA_BOARD_CONFIG=$(mktemp)

From f28359be79242d3e3a7948ea8175bd1e7971a87e Mon Sep 17 00:00:00 2001
From: "Jason D. McCormick" <jason@mfamily.org>
Date: Sun, 1 Dec 2024 12:14:38 -0500
Subject: [PATCH 2/2] fix logic when qmeu-arm-static is needed and not needed

---
 src/custompios | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/custompios b/src/custompios
index 5abf038f..7d3d867c 100755
--- a/src/custompios
+++ b/src/custompios
@@ -30,8 +30,7 @@ function execute_chroot_script() {
   fi
 
   #black magic of qemu-arm-static
-  # cp `which qemu-arm-static` usr/bin
-  if [ "$(uname -m)" != "armv7l" ] || [ "$(uname -m)" != "aarch64" ] ; then
+  if [ "$(uname -m)" != "armv7l" ] && [ "$(uname -m)" != "aarch64" ] ; then
     if [ "$BASE_ARCH" == "armv7l" ] || [ "$BASE_ARCH" == "armhf" ]; then
       if (grep -q gentoo /etc/os-release);then
         ROOT="`realpath .`" emerge --usepkgonly --oneshot --nodeps qemu
@@ -45,6 +44,8 @@ function execute_chroot_script() {
         cp `which qemu-aarch64-static` usr/bin/qemu-aarch64-static
       fi
     fi
+  elif [[ ( "$BASE_ARCH" == "armv7l" || "$BASE_ARCH" == "armhf" ) && "$(uname -m)" != "armv7l" ]]; then
+    cp `which qemu-aarch64-static` usr/bin/qemu-aarch64-static
   fi
   
   cp $2 chroot_script
@@ -74,7 +75,7 @@ function execute_chroot_script() {
         echo "Unknown arch, building on: $(uname -m) image: $BASE_ARCH"
 	exit 1
     fi
-  elif { [ "$BASE_ARCH" == "armv7l" ] || [ "$BASE_ARCH" == "armhf" ]; }  && [ "$(uname -m)" != "armv7l" ]; then
+  elif [[ ( "${BASE_ARCH}" == "armv7l" || "${BASE_ARCH}" == "armhf" ) && "$(uname -m)" != "armv7l" ]]; then
     echo "Building on aarch64/arm64 device a armv7l system, using qemu-arm-static"
     chroot . usr/bin/qemu-arm-static /bin/bash /chroot_script
   else