gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: also remove routing feed to prevent indexing errors

Browse Source 
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.
This commit is contained in:
CyberMind-FR 2025-12-23 22:53:35 +01:00
parent 3aa8cbf27e
commit 3cd072382a
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/build-openwrt-packages.yml vendored
View File

@ -244,13 +244,14 @@ jobs:
echo "📝 Configuring feeds with GitHub mirrors..." 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 if [[ -f "feeds.conf.default" ]]; then
sed -i '/telephony/d' feeds.conf.default 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 fi
# Use GitHub mirrors - only essential feeds (no telephony) # Use GitHub mirrors - only essential feeds
cat > feeds.conf << 'FEEDS' cat > feeds.conf << 'FEEDS'
src-git base https://github.com/openwrt/openwrt.git;openwrt-23.05 src-git base https://github.com/openwrt/openwrt.git;openwrt-23.05
src-git packages https://github.com/openwrt/packages.git;openwrt-23.05 src-git packages https://github.com/openwrt/packages.git;openwrt-23.05
@ -306,9 +307,9 @@ jobs:
LUCI_MK LUCI_MK
fi fi
# Final cleanup of telephony feed (if somehow it still got created) # Final cleanup of unwanted feeds (if somehow they still got created)
rm -f feeds/telephony.index 2>/dev/null || true rm -f feeds/telephony.index feeds/routing.index 2>/dev/null || true
rm -rf feeds/telephony 2>/dev/null || true rm -rf feeds/telephony feeds/routing 2>/dev/null || true
make defconfig make defconfig
echo "✅ SDK configured" echo "✅ SDK configured"

11
.github/workflows/build-secubox-images.yml vendored
View File

@ -150,10 +150,11 @@ jobs:
run: | run: |
cd openwrt 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 if [[ -f "feeds.conf.default" ]]; then
sed -i '/telephony/d' feeds.conf.default 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 fi
./scripts/feeds update -a ./scripts/feeds update -a
@ -311,9 +312,9 @@ jobs:
run: | run: |
cd openwrt cd openwrt
# Final cleanup of telephony feed (if somehow it still got created) # Final cleanup of unwanted feeds (if somehow they still got created)
rm -f feeds/telephony.index 2>/dev/null || true rm -f feeds/telephony.index feeds/routing.index 2>/dev/null || true
rm -rf feeds/telephony 2>/dev/null || true rm -rf feeds/telephony feeds/routing 2>/dev/null || true
make defconfig make defconfig

15
.github/workflows/test-validate.yml vendored
View File

@ -230,18 +230,19 @@ jobs:
run: | run: |
cd ~/sdk 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 if [[ -f "feeds.conf.default" ]]; then
sed -i '/telephony/d' feeds.conf.default 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 fi
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
# Final cleanup of telephony feed # Final cleanup of unwanted feeds
rm -f feeds/telephony.index 2>/dev/null || true rm -f feeds/telephony.index feeds/routing.index 2>/dev/null || true
rm -rf feeds/telephony 2>/dev/null || true rm -rf feeds/telephony feeds/routing 2>/dev/null || true
make defconfig make defconfig
@ -274,8 +275,8 @@ jobs:
done done
# Final cleanup before defconfig # Final cleanup before defconfig
rm -f feeds/telephony.index 2>/dev/null || true rm -f feeds/telephony.index feeds/routing.index 2>/dev/null || true
rm -rf feeds/telephony 2>/dev/null || true rm -rf feeds/telephony feeds/routing 2>/dev/null || true
make defconfig make defconfig