From 3cd072382a49d6e7b1c26503dee5bd3119a51656 Mon Sep 17 00:00:00 2001
From: CyberMind-FR <gandalf@Gk2.net>
Date: Tue, 23 Dec 2025 22:53:35 +0100
Subject: [PATCH] fix: also remove routing feed to prevent indexing errors

Extended the feed removal to also exclude the routing feed, which was
causing the same indexing error during make defconfig.

Now removing both telephony and routing feeds from feeds.conf.default
before updating feeds in all three workflows.

This ensures only base, packages, and luci feeds are used.
---
 .github/workflows/build-openwrt-packages.yml | 13 +++++++------
 .github/workflows/build-secubox-images.yml   | 11 ++++++-----
 .github/workflows/test-validate.yml          | 15 ++++++++-------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-openwrt-packages.yml b/.github/workflows/build-openwrt-packages.yml
index 7e77136f..061abf53 100644
--- a/.github/workflows/build-openwrt-packages.yml
+++ b/.github/workflows/build-openwrt-packages.yml
@@ -244,13 +244,14 @@ jobs:
 
           echo "📝 Configuring feeds with GitHub mirrors..."
 
-          # FIRST: Remove telephony from feeds.conf.default to prevent it from being indexed
+          # FIRST: Remove unwanted feeds from feeds.conf.default to prevent indexing errors
           if [[ -f "feeds.conf.default" ]]; then
             sed -i '/telephony/d' feeds.conf.default
-            echo "✅ Removed telephony from feeds.conf.default"
+            sed -i '/routing/d' feeds.conf.default
+            echo "✅ Removed telephony and routing from feeds.conf.default"
           fi
 
-          # Use GitHub mirrors - only essential feeds (no telephony)
+          # Use GitHub mirrors - only essential feeds
           cat > feeds.conf << 'FEEDS'
           src-git base https://github.com/openwrt/openwrt.git;openwrt-23.05
           src-git packages https://github.com/openwrt/packages.git;openwrt-23.05
@@ -306,9 +307,9 @@ jobs:
           LUCI_MK
           fi
           
-          # Final cleanup of telephony feed (if somehow it still got created)
-          rm -f feeds/telephony.index 2>/dev/null || true
-          rm -rf feeds/telephony 2>/dev/null || true
+          # Final cleanup of unwanted feeds (if somehow they still got created)
+          rm -f feeds/telephony.index feeds/routing.index 2>/dev/null || true
+          rm -rf feeds/telephony feeds/routing 2>/dev/null || true
 
           make defconfig
           echo "✅ SDK configured"
diff --git a/.github/workflows/build-secubox-images.yml b/.github/workflows/build-secubox-images.yml
index 3b2477a9..6d3857f8 100644
--- a/.github/workflows/build-secubox-images.yml
+++ b/.github/workflows/build-secubox-images.yml
@@ -150,10 +150,11 @@ jobs:
         run: |
           cd openwrt
 
-          # Remove telephony from feeds.conf.default BEFORE updating feeds
+          # Remove unwanted feeds from feeds.conf.default BEFORE updating feeds
           if [[ -f "feeds.conf.default" ]]; then
             sed -i '/telephony/d' feeds.conf.default
-            echo "✅ Removed telephony from feeds.conf.default"
+            sed -i '/routing/d' feeds.conf.default
+            echo "✅ Removed telephony and routing from feeds.conf.default"
           fi
 
           ./scripts/feeds update -a
@@ -311,9 +312,9 @@ jobs:
         run: |
           cd openwrt
 
-          # Final cleanup of telephony feed (if somehow it still got created)
-          rm -f feeds/telephony.index 2>/dev/null || true
-          rm -rf feeds/telephony 2>/dev/null || true
+          # Final cleanup of unwanted feeds (if somehow they still got created)
+          rm -f feeds/telephony.index feeds/routing.index 2>/dev/null || true
+          rm -rf feeds/telephony feeds/routing 2>/dev/null || true
 
           make defconfig
 
diff --git a/.github/workflows/test-validate.yml b/.github/workflows/test-validate.yml
index 98bbe167..bb56290c 100644
--- a/.github/workflows/test-validate.yml
+++ b/.github/workflows/test-validate.yml
@@ -230,18 +230,19 @@ jobs:
         run: |
           cd ~/sdk
 
-          # Remove telephony from feeds.conf.default BEFORE updating feeds
+          # Remove unwanted feeds from feeds.conf.default BEFORE updating feeds
           if [[ -f "feeds.conf.default" ]]; then
             sed -i '/telephony/d' feeds.conf.default
-            echo "✅ Removed telephony from feeds.conf.default"
+            sed -i '/routing/d' feeds.conf.default
+            echo "✅ Removed telephony and routing from feeds.conf.default"
           fi
 
           ./scripts/feeds update -a
           ./scripts/feeds install -a
 
-          # Final cleanup of telephony feed
-          rm -f feeds/telephony.index 2>/dev/null || true
-          rm -rf feeds/telephony 2>/dev/null || true
+          # Final cleanup of unwanted feeds
+          rm -f feeds/telephony.index feeds/routing.index 2>/dev/null || true
+          rm -rf feeds/telephony feeds/routing 2>/dev/null || true
 
           make defconfig
 
@@ -274,8 +275,8 @@ jobs:
           done
 
           # Final cleanup before defconfig
-          rm -f feeds/telephony.index 2>/dev/null || true
-          rm -rf feeds/telephony 2>/dev/null || true
+          rm -f feeds/telephony.index feeds/routing.index 2>/dev/null || true
+          rm -rf feeds/telephony feeds/routing 2>/dev/null || true
 
           make defconfig