[v2,1/2] fff-alfred: new package

Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

Changes in v2:
- Use uci-defaults instead of own config because config is installed
  by the alfred package.

 bsp/default/root_file_system/etc/config/alfred     |  6 ----
 src/packages/fff/fff-alfred/Makefile               | 40 ++++++++++++++++++++++
 .../files/etc/uci-defaults/51-fff-alfred           | 12 +++++++
 src/packages/fff/fff-nodewatcher/Makefile          |  4 +--
 4 files changed, 54 insertions(+), 8 deletions(-)
 delete mode 100644 bsp/default/root_file_system/etc/config/alfred
 create mode 100644 src/packages/fff/fff-alfred/Makefile
 create mode 100644 src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred

hi

Tested-by: Christian Dresel <fff@chrisi01.de>
auf einen wr1043 v2

Reviewed-by: Christian Dresel <fff@chrisi01.de>

mfg

Christian

On 12.11.2017 14:48, Tim Niemeyer wrote:
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> ---
>
> Changes in v2:
> - Use uci-defaults instead of own config because config is installed
>   by the alfred package.
>
>  bsp/default/root_file_system/etc/config/alfred     |  6 ----
>  src/packages/fff/fff-alfred/Makefile               | 40 ++++++++++++++++++++++
>  .../files/etc/uci-defaults/51-fff-alfred           | 12 +++++++
>  src/packages/fff/fff-nodewatcher/Makefile          |  4 +--
>  4 files changed, 54 insertions(+), 8 deletions(-)
>  delete mode 100644 bsp/default/root_file_system/etc/config/alfred
>  create mode 100644 src/packages/fff/fff-alfred/Makefile
>  create mode 100644 src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
>
> diff --git a/bsp/default/root_file_system/etc/config/alfred b/bsp/default/root_file_system/etc/config/alfred
> deleted file mode 100644
> index 5fd4259..0000000
> --- a/bsp/default/root_file_system/etc/config/alfred
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -config 'alfred' 'alfred'
> -    option interface 'br-mesh'
> -    option mode 'slave'
> -    option batmanif 'bat0'
> -    option start_vis '0'
> -    option run_facters '0'
> diff --git a/src/packages/fff/fff-alfred/Makefile b/src/packages/fff/fff-alfred/Makefile
> new file mode 100644
> index 0000000..2c3140c
> --- /dev/null
> +++ b/src/packages/fff/fff-alfred/Makefile
> @@ -0,0 +1,40 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-alfred
> +PKG_VERSION:=1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/$(PKG_NAME)
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:=Freifunk-Franken Alfred
> +    URL:=http://www.freifunk-franken.de
> +    DEPENDS:=+alfred
> +endef
> +
> +define Package/$(PKG_NAME)/description
> +    This is the Freifunk Franken Firmware Alfred package.
> +    This packages configures the Alfred on the device.
> +endef
> +
> +define Build/Prepare
> +    echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +    # nothing
> +endef
> +
> +define Build/Compile
> +    # nothing
> +endef
> +
> +define Package/$(PKG_NAME)/install
> +    $(CP) ./files/* $(1)/
> +endef
> +
> +$(eval $(call BuildPackage,$(PKG_NAME)))
> diff --git a/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
> new file mode 100644
> index 0000000..e09281e
> --- /dev/null
> +++ b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
> @@ -0,0 +1,12 @@
> +#!/bin/sh
> +
> +>/etc/config/alfred
> +
> +uci batch <<EOF
> +  set alfred.alfred=alfred
> +  set alfred.alfred.interface='br-mesh'
> +  set alfred.alfred.mode='slave'
> +  set alfred.alfred.batmanif='bat0'
> +  set alfred.alfred.start_vis='0'
> +  set alfred.alfred.run_facters='0'
> +EOF
> diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
> index 79cb917..bdceffd 100644
> --- a/src/packages/fff/fff-nodewatcher/Makefile
> +++ b/src/packages/fff/fff-nodewatcher/Makefile
> @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=fff-nodewatcher
>  PKG_VERSION:=41
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
>  
> @@ -13,7 +13,7 @@ define Package/$(PKG_NAME)
>      CATEGORY:=Freifunk
>      TITLE:= Freifunk-Franken Nodewatcher
>      URL:=http://www.freifunk-franken.de
> -    DEPENDS:=+alfred +micrond +fff-random +ip +ip-bridge
> +    DEPENDS:=+fff-alfred +micrond +fff-random +ip +ip-bridge
>  endef
>  
>  define Package/$(PKG_NAME)/description

Hi

Set applied.

Tim

Am Sonntag, den 12.11.2017, 14:48 +0100 schrieb Tim Niemeyer:
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> ---
> 
> Changes in v2:
> - Use uci-defaults instead of own config because config is installed
>   by the alfred package.
> 
>  bsp/default/root_file_system/etc/config/alfred     |  6 ----
>  src/packages/fff/fff-alfred/Makefile               | 40 ++++++++++++++++++++++
>  .../files/etc/uci-defaults/51-fff-alfred           | 12 +++++++
>  src/packages/fff/fff-nodewatcher/Makefile          |  4 +--
>  4 files changed, 54 insertions(+), 8 deletions(-)
>  delete mode 100644 bsp/default/root_file_system/etc/config/alfred
>  create mode 100644 src/packages/fff/fff-alfred/Makefile
>  create mode 100644 src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
> 
> diff --git a/bsp/default/root_file_system/etc/config/alfred b/bsp/default/root_file_system/etc/config/alfred
> deleted file mode 100644
> index 5fd4259..0000000
> --- a/bsp/default/root_file_system/etc/config/alfred
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -config 'alfred' 'alfred'
> -    option interface 'br-mesh'
> -    option mode 'slave'
> -    option batmanif 'bat0'
> -    option start_vis '0'
> -    option run_facters '0'
> diff --git a/src/packages/fff/fff-alfred/Makefile b/src/packages/fff/fff-alfred/Makefile
> new file mode 100644
> index 0000000..2c3140c
> --- /dev/null
> +++ b/src/packages/fff/fff-alfred/Makefile
> @@ -0,0 +1,40 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-alfred
> +PKG_VERSION:=1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/$(PKG_NAME)
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:=Freifunk-Franken Alfred
> +    URL:=http://www.freifunk-franken.de
> +    DEPENDS:=+alfred
> +endef
> +
> +define Package/$(PKG_NAME)/description
> +    This is the Freifunk Franken Firmware Alfred package.
> +    This packages configures the Alfred on the device.
> +endef
> +
> +define Build/Prepare
> +    echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +    # nothing
> +endef
> +
> +define Build/Compile
> +    # nothing
> +endef
> +
> +define Package/$(PKG_NAME)/install
> +    $(CP) ./files/* $(1)/
> +endef
> +
> +$(eval $(call BuildPackage,$(PKG_NAME)))
> diff --git a/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
> new file mode 100644
> index 0000000..e09281e
> --- /dev/null
> +++ b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
> @@ -0,0 +1,12 @@
> +#!/bin/sh
> +
> +>/etc/config/alfred
> +
> +uci batch <<EOF
> +  set alfred.alfred=alfred
> +  set alfred.alfred.interface='br-mesh'
> +  set alfred.alfred.mode='slave'
> +  set alfred.alfred.batmanif='bat0'
> +  set alfred.alfred.start_vis='0'
> +  set alfred.alfred.run_facters='0'
> +EOF
> diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
> index 79cb917..bdceffd 100644
> --- a/src/packages/fff/fff-nodewatcher/Makefile
> +++ b/src/packages/fff/fff-nodewatcher/Makefile
> @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=fff-nodewatcher
>  PKG_VERSION:=41
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
>  
> @@ -13,7 +13,7 @@ define Package/$(PKG_NAME)
>      CATEGORY:=Freifunk
>      TITLE:= Freifunk-Franken Nodewatcher
>      URL:=http://www.freifunk-franken.de
> -    DEPENDS:=+alfred +micrond +fff-random +ip +ip-bridge
> +    DEPENDS:=+fff-alfred +micrond +fff-random +ip +ip-bridge
>  endef
>  
>  define Package/$(PKG_NAME)/description