From 433b899ef03e1f0fe5e619c407e9a7ee170acdc8 Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Sun, 29 Jan 2023 15:56:42 -0500
Subject: [PATCH] More work on --source

---
 openwrtbuilder | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/openwrtbuilder b/openwrtbuilder
index 03792ab..31d5c4c 100755
--- a/openwrtbuilder
+++ b/openwrtbuilder
@@ -624,14 +624,8 @@ fromSource() {
 
     pushd "$GITWORKTREEDIR" &>/dev/null || return 1
 
-    # TODO for now remove the SEED_FILE, see notes below
-    [[ -f $SEED_FILE ]] && rm -f "$SEED_FILE"
-
-    # Update package feed
-    # ./scripts/feeds install will create defaults (make defconfig) 
-    # for an exiting .config so make sure it doesn't exist first
-    ./scripts/feeds update -a &&
-    ./scripts/feeds install -a
+    # If we don't distclean, make sure to remove existing .config
+    make distclean
 
     # Grab the release seed config
     if ! curl -so "$SEED_FILE" "$SEED_URL"; then
@@ -671,7 +665,11 @@ fromSource() {
     done
 
     # normalize .config and remove dupes
-    make defconfig # TODO
+    # Update package feed
+    # ./scripts/feeds install will create defaults (make defconfig) 
+    # for an exiting .config so make sure it doesn't exist first
+    ./scripts/feeds update -a &&
+    ./scripts/feeds install -a
 
     # TODO for now symlink clang for qosify
     [[ -d "$GITSRCDIR/staging_dir/host/llvm-bpf/bin" ]] || mkdir -p "$GITSRCDIR/staging_dir/host/llvm-bpf/bin"