[PATCH] fff-wireless: always disable rssileds if package is installed
Fabian Bläse
fabian at blaese.de
Fr Jan 10 11:57:42 CET 2020
Hallo Adrian,
das rssileds wird ja bei den DEVICE_PACKAGES angewählt. Können wir das ganze Paket nicht einfach für die betroffenen Geräte deselektieren?
Falls nicht:
Reviewed-by: Fabian Bläse <fabian at blaese.de>
Gruß
Fabian
On 08.01.20 18:23, Adrian Schmutzler wrote:
> This always disables rssileds if the package is installed, and thus
> saves us from specifying particular devices.
>
> Since rssileds do not work with our concept of resetting WiFi
> interfaces, we cannot use it anyway.
>
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
> src/packages/fff/fff-wireless/Makefile | 2 +-
> .../files/etc/uci-defaults/24b-config-wireless | 12 ++----------
> 2 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile
> index e805ea22..02328a2b 100644
> --- a/src/packages/fff/fff-wireless/Makefile
> +++ b/src/packages/fff/fff-wireless/Makefile
> @@ -1,7 +1,7 @@
> include $(TOPDIR)/rules.mk
>
> PKG_NAME:=fff-wireless
> -PKG_RELEASE:=14
> +PKG_RELEASE:=15
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
>
> diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
> index a2c2ff63..d4f2267e 100644
> --- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
> +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
> @@ -41,13 +41,5 @@ case "$BOARD" in
> ;;
> esac
>
> -# rssileds
> -case "$BOARD" in
> - cpe210|\
> - cpe210-v2|\
> - cpe210-v3|\
> - cpe510|\
> - tl-wa850re-v1)
> - /etc/init.d/rssileds disable
> - ;;
> -esac
> +# rssileds: always disable if package is installed
> +[ -x "/etc/init.d/rssileds" ] && /etc/init.d/rssileds disable
>
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : signature.asc
Dateityp : application/pgp-signature
Dateigröße : 833 bytes
Beschreibung: OpenPGP digital signature
URL : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20200110/4138c46a/attachment.sig>
Mehr Informationen über die Mailingliste franken-dev