[PATCH] buildscript: clean feeds before updating them

[mail at adrianschmutzler.de]

Reviewed-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
> Of Fabian Bläse
> Sent: Freitag, 17. April 2020 15:40
> To: franken-dev at freifunk.net
> Subject: [PATCH] buildscript: clean feeds before updating them
> 
> 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
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : openpgp-digital-signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 834 bytes
Beschreibung: nicht verfügbar
URL         : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20200417/f885dc0f/attachment.sig>