[PATCH 2/2] Add fff-ra package

[Christian Dresel]

Hallo Fabian

On 28.01.19 18:08, Fabian Bläse wrote:
> Signed-off-by: Fabian Bläse <fabian at blaese.de>
> ---
>  src/packages/fff/fff-ra/Makefile              | 40 +++++++++++++++++++
>  .../fff-ra/files/etc/uci-defaults/90-fff-ra   | 11 +++++
>  2 files changed, 51 insertions(+)
>  create mode 100644 src/packages/fff/fff-ra/Makefile
>  create mode 100644 src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
>
> diff --git a/src/packages/fff/fff-ra/Makefile b/src/packages/fff/fff-ra/Makefile
> new file mode 100644
> index 0000000..64b02ea
> --- /dev/null
> +++ b/src/packages/fff/fff-ra/Makefile
> @@ -0,0 +1,40 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-ra
> +PKG_VERSION:=1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-ra
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/fff-ra
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:=Freifunk-Franken Router Advertisements
> +    URL:=https://www.freifunk-franken.de
> +    DEPENDS:=+odhcpd
> +endef
> +
> +define Package/fff-ra/description
> +    This is the fff-ra for the Freifunk Franken Firmware
> +    It is used to configure odhcpd to send Router Advertisements for use as gateway.
> +endef
> +
> +define Build/Prepare
> +    echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +    # nothing
> +endef
> +
> +define Build/Compile
> +    # nothing
> +endef
> +
> +define Package/fff-ra/install
> +    $(CP) ./files/* $(1)/
> +endef
> +
> +$(eval $(call BuildPackage,fff-ra))
> diff --git a/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra b/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
> new file mode 100644
> index 0000000..0a1c446
> --- /dev/null
> +++ b/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
> @@ -0,0 +1,11 @@
> +#!/bin/sh
> +

im anderen Patch machst du:

   set dhcp.mesh=dhcp
   set dhcp.mesh.interface='mesh'
-  set dhcp.mesh.ra='server'
-  set dhcp.mesh.ra_management='0'
   set dhcp.mesh.leasetime='1h'

> +uci batch <<EOF
> +	set dhcp.mesh=dhcp
> +	set dhcp.mesh.interface='mesh'
> +	set dhcp.mesh.ra='server'
> +	set dhcp.mesh.ra_default='2'
> +	set dhcp.mesh.ra_management='0'

hier fügst du dann aber den ganzen Block neu hinzu. Entsteht die ersten
2 Zeilen dann nicht doppelt? Oder versteh ich das gerade falsch?

Gruß

Christian

> +EOF
> +
> +exit 0