From d562b64c492b096d731992db2d05b561c6e6955e Mon Sep 17 00:00:00 2001 From: CyberMind-FR Date: Tue, 23 Dec 2025 22:19:29 +0100 Subject: [PATCH] fix: remove telephony feed from defconfig to prevent indexing errors The telephony feed was causing 'Collecting package info' failures during make defconfig. This fix removes the telephony feed directory and references from feeds.conf.default before running defconfig in all workflows. Fixes applied to: - build-openwrt-packages.yml - build-secubox-images.yml - test-validate.yml --- .github/workflows/build-openwrt-packages.yml | 8 +++++++- .github/workflows/build-secubox-images.yml | 11 +++++++++++ .github/workflows/test-validate.yml | 17 ++++++++++++++++- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-openwrt-packages.yml b/.github/workflows/build-openwrt-packages.yml index a2fdfe10..c518ef3a 100644 --- a/.github/workflows/build-openwrt-packages.yml +++ b/.github/workflows/build-openwrt-packages.yml @@ -303,7 +303,13 @@ jobs: # Clean up any stale feed references rm -f feeds/telephony.index 2>/dev/null || true rm -rf feeds/telephony 2>/dev/null || true - + + # Remove telephony from feeds.conf.default if it exists + if [[ -f "feeds.conf.default" ]]; then + sed -i '/telephony/d' feeds.conf.default + echo "✅ Removed telephony from feeds.conf.default" + fi + make defconfig echo "✅ SDK configured" diff --git a/.github/workflows/build-secubox-images.yml b/.github/workflows/build-secubox-images.yml index 20be4750..14607217 100644 --- a/.github/workflows/build-secubox-images.yml +++ b/.github/workflows/build-secubox-images.yml @@ -303,6 +303,17 @@ jobs: - name: Make defconfig run: | cd openwrt + + # Clean up telephony feed to avoid indexing errors + rm -f feeds/telephony.index 2>/dev/null || true + rm -rf feeds/telephony 2>/dev/null || true + + # Remove telephony from feeds.conf.default if it exists + if [[ -f "feeds.conf.default" ]]; then + sed -i '/telephony/d' feeds.conf.default + echo "✅ Removed telephony from feeds.conf.default" + fi + make defconfig - name: Download packages diff --git a/.github/workflows/test-validate.yml b/.github/workflows/test-validate.yml index a8d4c46e..743cd6f9 100644 --- a/.github/workflows/test-validate.yml +++ b/.github/workflows/test-validate.yml @@ -231,6 +231,14 @@ jobs: cd ~/sdk ./scripts/feeds update -a ./scripts/feeds install -a + + # Clean up telephony feed to avoid indexing errors + rm -f feeds/telephony.index 2>/dev/null || true + rm -rf feeds/telephony 2>/dev/null || true + if [[ -f "feeds.conf.default" ]]; then + sed -i '/telephony/d' feeds.conf.default + fi + make defconfig - name: Copy packages @@ -260,7 +268,14 @@ jobs: echo "✅ Enabled: $PKG_NAME" fi done - + + # Clean up telephony feed before defconfig + rm -f feeds/telephony.index 2>/dev/null || true + rm -rf feeds/telephony 2>/dev/null || true + if [[ -f "feeds.conf.default" ]]; then + sed -i '/telephony/d' feeds.conf.default + fi + make defconfig - name: Build packages