From f411c19f470440f80b3e1852290056d35bf4b4d7 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Mon, 1 Dec 2025 10:26:06 -0800
Subject: [PATCH] fix local build option

---
 buildroot/package/vanilla/Config.in  | 12 +++++++++---
 buildroot/package/vanilla/vanilla.mk | 13 +++++++------
 docker/raspberrypi0w/build.sh        |  3 ++-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/buildroot/package/vanilla/Config.in b/buildroot/package/vanilla/Config.in
index f852f08..7a593ac 100644
--- a/buildroot/package/vanilla/Config.in
+++ b/buildroot/package/vanilla/Config.in
@@ -7,10 +7,16 @@ config BR2_PACKAGE_VANILLA
 
 if BR2_PACKAGE_VANILLA
 
-config BR2_PACKAGE_VANILLA_LOCAL_PATH
-    string "Local repository"
+config BR2_PACKAGE_VANILLA_USE_LOCAL
+    bool "Local build"
     help
-        Local directory to build Vanilla from instead of retrieving from GitHub.
+        Use a local build directory rather than pulling from GitHub.
         Useful for Docker builds or development.
 
+config BR2_PACKAGE_VANILLA_LOCAL_PATH
+    depends on BR2_PACKAGE_VANILLA_USE_LOCAL
+    string "Local repository path"
+    help
+        Local directory to build Vanilla.
+
 endif
diff --git a/buildroot/package/vanilla/vanilla.mk b/buildroot/package/vanilla/vanilla.mk
index 6dc3f2f..d0effc3 100644
--- a/buildroot/package/vanilla/vanilla.mk
+++ b/buildroot/package/vanilla/vanilla.mk
@@ -1,13 +1,14 @@
-ifeq ($(strip $(BR2_PACKAGE_VANILLA_LOCAL_PATH)),)
-
-VANILLA_VERSION = master
-VANILLA_SITE = $(call github,vanilla-wiiu,vanilla,$(VANILLA_VERSION))
-
-else
+ifeq ($(BR2_PACKAGE_VANILLA_USE_LOCAL),y)
 
 VANILLA_VERSION = local
 VANILLA_SITE = $(BR2_PACKAGE_VANILLA_LOCAL_PATH)
 VANILLA_SITE_METHOD = local
+VANILLA_OVERRIDE_SRCDIR = $(VANILLA_SITE)
+
+else
+
+VANILLA_VERSION = master
+VANILLA_SITE = $(call github,vanilla-wiiu,vanilla,$(VANILLA_VERSION))
 
 endif
 
diff --git a/docker/raspberrypi0w/build.sh b/docker/raspberrypi0w/build.sh
index 3b17a01..2febf23 100755
--- a/docker/raspberrypi0w/build.sh
+++ b/docker/raspberrypi0w/build.sh
@@ -3,7 +3,8 @@
 set -e
 
 make -C /buildroot O=/build BR2_EXTERNAL=/vanilla/buildroot vanilla_raspberrypi0w_defconfig
-/buildroot/utils/config --set-str BR2_PACKAGE_VANILLA_LOCAL_PATH /vanilla
+/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA_USE_LOCAL
+/buildroot/utils/config --file /build/.config --set-str BR2_PACKAGE_VANILLA_LOCAL_PATH /vanilla
 make -C /buildroot O=/build
 
 cd /build/images