fix: remove telephony feed BEFORE updating feeds

Moved telephony removal to occur BEFORE './scripts/feeds update' to prevent
the telephony feed from ever being cloned or indexed. The previous fix tried
to remove telephony after feeds were already updated, which was too late.

Key changes:
- Remove telephony from feeds.conf.default BEFORE feed updates
- Keep final cleanup before make defconfig as safety measure
- Applies to all three workflows

This should completely eliminate the 'Collecting package info: feeds/telephony'
error during make defconfig.
This commit is contained in:
CyberMind-FR 2025-12-23 22:50:13 +01:00
parent d562b64c49
commit 3aa8cbf27e
3 changed files with 28 additions and 26 deletions

View File

@ -241,19 +241,25 @@ jobs:
- name: Setup SDK feeds (GitHub mirrors)
run: |
cd sdk
echo "📝 Configuring feeds with GitHub mirrors..."
# FIRST: Remove telephony from feeds.conf.default to prevent it from being indexed
if [[ -f "feeds.conf.default" ]]; then
sed -i '/telephony/d' feeds.conf.default
echo "✅ Removed telephony from feeds.conf.default"
fi
# Use GitHub mirrors - only essential feeds (no telephony)
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
src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
FEEDS
echo "📋 feeds.conf:"
cat feeds.conf
# Update feeds individually with error handling
echo ""
echo "🔄 Updating feeds..."
@ -300,16 +306,10 @@ jobs:
LUCI_MK
fi
# Clean up any stale feed references
# 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
# 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"

View File

@ -149,6 +149,13 @@ jobs:
- name: Update feeds
run: |
cd openwrt
# Remove telephony 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"
fi
./scripts/feeds update -a
./scripts/feeds install -a
@ -304,16 +311,10 @@ jobs:
run: |
cd openwrt
# Clean up telephony feed to avoid indexing errors
# 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
# 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

View File

@ -229,15 +229,19 @@ jobs:
- name: Prepare SDK
run: |
cd ~/sdk
# Remove telephony 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"
fi
./scripts/feeds update -a
./scripts/feeds install -a
# Clean up telephony feed to avoid indexing errors
# Final cleanup of telephony feed
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
@ -269,12 +273,9 @@ jobs:
fi
done
# Clean up telephony feed before defconfig
# Final cleanup 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