[PATCH] buildscript: clean feeds before updating them

Fabian Bläse fabian at blaese.de
Fr Apr 17 15:39:58 CEST 2020


When installing feed packages that already have been installed
from a different feed, OpenWrts feeds script does not change
the feed, but keeps the already installed package.

Therefore, packages are not updated to the correct feed on
updatefeeds, when the package is moved to a different feed
in our buildscript.

The update_feeds function already contains code to clean the already
installed feeds, but only removes the symlinks to the feed directory.
OpenWrts package installation directory (packages/feeds/*) is not
removed, however.

The 'clean' command of the scripts/feeds script properly cleans up
both directories. Hence, the 'rm' command is replaced with it.

Signed-off-by: Fabian Bläse <fabian at blaese.de>
---
 buildscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildscript b/buildscript
index 386d06c..5751934 100755
--- a/buildscript
+++ b/buildscript
@@ -163,7 +163,7 @@ update_feeds() {
     done
 
     echo "cleaning feeds"
-    /bin/rm -rf "$builddir"/feeds
+    "$builddir"/scripts/feeds clean
 
     "$builddir"/scripts/feeds update
 
-- 
2.26.0



Mehr Informationen über die Mailingliste franken-dev