[PATCH v2] adds a 'support' package for scripts not neccessary

Tim Niemeyer tim at tn-x.org
Fr Mai 6 13:32:14 CEST 2016


Hi Tobias

Whitespaces korrigiert und eingepsielt.

Tim

Am Mittwoch, den 04.05.2016, 09:47 +0200 schrieb Tobias Klaus:
> First functionality is the possibility to have a file
> /etc/init.d/fff-userconfig on the nodes that is execeuted
> on each reboot and survives sysupgrades
> 
> Signed-off-by: Tobias Klaus <tk+ff at meskal.net>
> ---
>  src/packages/fff/fff-support/Makefile              | 41 ++++++++++++++++++++++
>  .../fff-support/files/etc/init.d/fff-userconfig    | 14 ++++++++
>  src/packages/fff/fff/Makefile                      |  3 +-
>  3 files changed, 57 insertions(+), 1 deletion(-)
>  create mode 100644 src/packages/fff/fff-support/Makefile
>  create mode 100755 src/packages/fff/fff-support/files/etc/init.d/fff-userconfig
> 
> diff --git a/src/packages/fff/fff-support/Makefile b/src/packages/fff/fff-support/Makefile
> new file mode 100644
> index 0000000..93e4090
> --- /dev/null
> +++ b/src/packages/fff/fff-support/Makefile
> @@ -0,0 +1,41 @@
> +include $(TOPDIR)/rules.mk
> +
> +PKG_NAME:=fff-support
> +PKG_VERSION:=0.0.1
> +PKG_RELEASE:=1
> +
> +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-support
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define Package/fff-support
> +    SECTION:=base
> +    CATEGORY:=Freifunk
> +    TITLE:=Freifunk-Franken Support Scripts
> +    URL:=http://www.freifunk-franken.de
> +    DEPENDS:=+ at BUSYBOX_CONFIG_ASH
> +endef
> +
> +define Package/fff-support/description
> +    This is the Freifunk Franken Firmware support package.
> +    This packages provides smaller convenience scripts,
> +		not essential to the operation of the Firmware
> +endef
> +
> +define Build/Prepare
> +    echo "all: " > $(PKG_BUILD_DIR)/Makefile
> +endef
> +
> +define Build/Configure
> +    # nothing
> +endef
> +
> +define Build/Compile
> +    # nothing
> +endef
> +
> +define Package/fff-support/install
> +    $(CP) ./files/* $(1)/
> +endef
> +
> +$(eval $(call BuildPackage,fff-support))
> diff --git a/src/packages/fff/fff-support/files/etc/init.d/fff-userconfig b/src/packages/fff/fff-support/files/etc/init.d/fff-userconfig
> new file mode 100755
> index 0000000..68f3fb2
> --- /dev/null
> +++ b/src/packages/fff/fff-support/files/etc/init.d/fff-userconfig
> @@ -0,0 +1,14 @@
> +#!/bin/sh /etc/rc.common
> +# Copyright (C) 2006 OpenWrt.org
> +
> +START=96
> +boot() {
> +  LOCALCONFIGSCRIPT="/etc/rc.local.fff_userconfig"
> +  #add LOCALCONFIGSCRIPT to sysupgrade regardless if it already exists or not to prevent data loss
> +  grep -q ^"${LOCALCONFIGSCRIPT}"$ /etc/sysupgrade.conf || echo "$LOCALCONFIGSCRIPT" >> /etc/sysupgrade.conf
> +
> +  # process user commands
> +	[ -f "${LOCALCONFIGSCRIPT}" ] && {
> +		sh /etc/rc.local.fff_userconfig
> +	}
> +}
> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
> index e709987..80ae83b 100644
> --- a/src/packages/fff/fff/Makefile
> +++ b/src/packages/fff/fff/Makefile
> @@ -20,7 +20,8 @@ define Package/fff-base
>               +fff-uradvd \
>               +fff-batman-adv-legacy \
>               +fff-fastd \
> -             +fff-firewall
> +             +fff-firewall \
> +             +fff-support
>  endef
>  
>  define Package/fff-base/description
> -- 
> 2.8.2
> 

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 473 bytes
Beschreibung: This is a digitally signed message part
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20160506/cd0e212b/attachment-0002.sig>


Mehr Informationen über die Mailingliste franken-dev