From 5e37a2e9ba8921fb5c036adbba2db711be6be40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Fri, 17 Apr 2020 15:39:58 +0200 Subject: [PATCH] buildscript: clean feeds before updating them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Adrian Schmutzler --- buildscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscript b/buildscript index d2da0e3..c418c1e 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