[PATCH 3/9] fff-fastd: new package

Steffen Pankratz kratz00 at gmx.de
Mi Mär 16 22:02:57 CET 2016


On Tue, 15 Mar 2016 07:31:27 +0100
Tim Niemeyer <tim at tn-x.org> wrote:

Hi Tim

Anmerkungen 'inline'.


> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> ---
> 
>  .../root_file_system/usr/lib/micron.d/default      |  1 -
>  src/packages/fff/fff-fastd/Makefile                | 45 ++++++++++++++++++++++
>  .../files}/etc/hotplug.d/iface/50-fastdstart       |  0
>  .../fff/fff-fastd/files/usr/lib/micron.d/fff-fastd |  1 +
>  .../fff/fff-fastd/files/usr/sbin/fastdstart        |  4 +-
>  5 files changed, 49 insertions(+), 2 deletions(-)
>  delete mode 100644 bsp/default/root_file_system/usr/lib/micron.d/default
>  create mode 100644 src/packages/fff/fff-fastd/Makefile
>  rename {bsp/default/root_file_system => src/packages/fff/fff-fastd/files}/etc/hotplug.d/iface/50-fastdstart (100%)
>  create mode 100644 src/packages/fff/fff-fastd/files/usr/lib/micron.d/fff-fastd
>  rename bsp/default/root_file_system/etc/fastdstart.sh.tpl => src/packages/fff/fff-fastd/files/usr/sbin/fastdstart (98%)
> 
> diff --git a/bsp/default/root_file_system/usr/lib/micron.d/default b/bsp/default/root_file_system/usr/lib/micron.d/default
> deleted file mode 100644
> index a5cebb0..0000000
> --- a/bsp/default/root_file_system/usr/lib/micron.d/default
> +++ /dev/null
> @@ -1 +0,0 @@
> -*/5 * * * * sleep $(/usr/bin/random 0 29); sh /etc/fastdstart.sh
> diff --git a/src/packages/fff/fff-fastd/Makefile b/src/packages/fff/fff-fastd/Makefile
> new file mode 100644
> index 0000000..26565e1
> --- /dev/null
> +++ b/src/packages/fff/fff-fastd/Makefile
> @@ -0,0 +1,45 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-fastd
> +PKG_VERSION:=1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-fastd
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/fff-fastd
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:=Freifunk-Franken fastd
> +    URL:=http://www.freifunk-franken.de
> +    DEPENDS:=+ at BUSYBOX_CUSTOM \
> +             + at BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT \
> +             + at FASTD_ENABLE_METHOD_NULL \
> +             + at FASTD_ENABLE_CIPHER_NULL \
> +             + at FASTD_WITH_STATUS_SOCKET \
> +             +fastd
> +endef

Ich habe nicht geschaut, ob es eine Abhaengigkeit zu den Busybox-Features gibt.
Wieso braucht Fastd diese Busybox-Features?


Aktuell haben wir in unseren OpenWrt Configs:

CONFIG_FASTD_ENABLE_CIPHER_NULL=y
CONFIG_FASTD_ENABLE_MAC_UHASH=y
CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC=y
CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC=y
CONFIG_FASTD_ENABLE_METHOD_NULL=y
CONFIG_FASTD_WITH_STATUS_SOCKET=y

Wieso sind einige der Features davon raus geflogen?


> +define Package/fff-batman-adv-legacy/description
> +    This is the fastd for the Freifunk Franken Firmware
> +    It is used to configure fastd.
> +endef
> +
> +define Build/Prepare
> +	echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +	# nothing
> +endef
> +
> +define Build/Compile
> +	# nothing
> +endef
> +
> +define Package/fff-fastd/install
> +	$(CP) ./files/* $(1)/
> +endef
> +
> +$(eval $(call BuildPackage,fff-fastd))
> diff --git a/bsp/default/root_file_system/etc/hotplug.d/iface/50-fastdstart b/src/packages/fff/fff-fastd/files/etc/hotplug.d/iface/50-fastdstart
> similarity index 100%
> rename from bsp/default/root_file_system/etc/hotplug.d/iface/50-fastdstart
> rename to src/packages/fff/fff-fastd/files/etc/hotplug.d/iface/50-fastdstart
> diff --git a/src/packages/fff/fff-fastd/files/usr/lib/micron.d/fff-fastd b/src/packages/fff/fff-fastd/files/usr/lib/micron.d/fff-fastd
> new file mode 100644
> index 0000000..b0022e8
> --- /dev/null
> +++ b/src/packages/fff/fff-fastd/files/usr/lib/micron.d/fff-fastd
> @@ -0,0 +1 @@
> +*/5 * * * * sleep $(/usr/bin/random 0 29); sh /usr/sbin/fastdstart
> diff --git a/bsp/default/root_file_system/etc/fastdstart.sh.tpl b/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
> similarity index 98%
> rename from bsp/default/root_file_system/etc/fastdstart.sh.tpl
> rename to src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
> index 5bb5165..611a3f8 100755
> --- a/bsp/default/root_file_system/etc/fastdstart.sh.tpl
> +++ b/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
> @@ -3,7 +3,9 @@
>  SERVER="no"
>  #SERVERNAME="--servername--"
>  
> -project="${VPN_PROJECT}"
> +. /etc/community.cfg
> +
> +project="$VPN_PROJECT"
>  
>  test_ipv4_host1="keyserver.freifunk-franken.de" # Freifunk-Franken keyserver
>  test_ipv4_host2="8.8.8.8"        # Google DNS
> -- 
> 2.1.4


Gruss
-Steffen

-- 
Hermes powered by Manjaro Linux (Linux 4.4.5)

Best regards, Steffen Pankratz.
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : nicht verfügbar
Dateityp    : application/pgp-signature
Dateigröße  : 181 bytes
Beschreibung: OpenPGP digital signature
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20160316/552e99e0/attachment-0002.sig>


Mehr Informationen über die Mailingliste franken-dev