From aad3ba8403b78659dab39889b57f8eb2883160a2 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 19 Dec 2015 13:44:41 +0100 Subject: [PATCH] nodewatcher: move to separate package - remove template parameter NETMON_IP (it's always the same) - add new fff-nodewatcher package - move nodewatcher, configurator, syncHostname to fff-nodewatcher - fff-base selects fff-nodewatcher Signed-off-by: Tim Niemeyer Reviewed-by: Steffen Pankratz --- bsp/ar71xx/.config | 5 +-- .../root_file_system/usr/lib/micron.d/default | 3 +- bsp/wdr4300/.config | 5 +-- bsp/wdr4900/.config | 5 +-- community/aux.cfg | 1 - community/franken.cfg | 3 +- src/packages/fff/fff-nodewatcher/Makefile | 42 +++++++++++++++++++ .../files/etc/config/configurator | 4 +- .../files}/etc/config/nodewatcher | 0 .../etc/hotplug.d/iface/51-configurator | 2 +- .../files/usr/lib/micron.d/fff-nodewatcher | 2 + .../files/usr/sbin/configurator | 0 .../files/usr/sbin/nodewatcher | 0 .../files/usr/sbin/syncHostname | 0 src/packages/fff/fff/Makefile | 4 +- 15 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 src/packages/fff/fff-nodewatcher/Makefile rename bsp/default/root_file_system/etc/config/configurator.tpl => src/packages/fff/fff-nodewatcher/files/etc/config/configurator (85%) rename {bsp/default/root_file_system => src/packages/fff/fff-nodewatcher/files}/etc/config/nodewatcher (100%) rename {bsp/default/root_file_system => src/packages/fff/fff-nodewatcher/files}/etc/hotplug.d/iface/51-configurator (71%) create mode 100644 src/packages/fff/fff-nodewatcher/files/usr/lib/micron.d/fff-nodewatcher rename bsp/default/root_file_system/etc/configurator.sh => src/packages/fff/fff-nodewatcher/files/usr/sbin/configurator (100%) mode change 100644 => 100755 rename bsp/default/root_file_system/etc/nodewatcher.sh => src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher (100%) rename bsp/default/root_file_system/etc/syncHostname.sh => src/packages/fff/fff-nodewatcher/files/usr/sbin/syncHostname (100%) diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config index c75a720..909299d 100644 --- a/bsp/ar71xx/.config +++ b/bsp/ar71xx/.config @@ -23,7 +23,7 @@ CONFIG_KMOD_BATMAN_ADV_LEGACY_BATCTL=y CONFIG_KMOD_BATMAN_ADV_LEGACY_BLA=y CONFIG_KMOD_BATMAN_ADV_LEGACY_DAT=y CONFIG_KMOD_BATMAN_ADV_LEGACY_NC=y -CONFIG_PACKAGE_alfred=y +# CONFIG_PACKAGE_ALFRED_VIS is not set CONFIG_PACKAGE_arptables=y # CONFIG_PACKAGE_dnsmasq is not set CONFIG_PACKAGE_ebtables=y @@ -61,8 +61,6 @@ CONFIG_PACKAGE_kmod-sched-connmark=y CONFIG_PACKAGE_kmod-sched-core=y CONFIG_PACKAGE_kmod-stp=y CONFIG_PACKAGE_kmod-tun=y -CONFIG_PACKAGE_libpthread=y -CONFIG_PACKAGE_librt=y CONFIG_PACKAGE_libugpio=y # CONFIG_PACKAGE_odhcpd is not set # CONFIG_PACKAGE_opkg is not set @@ -74,4 +72,3 @@ CONFIG_PACKAGE_wireless-tools=y # CONFIG_FASTD_ENABLE_MAC_GHASH is not set # CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set # CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set -# CONFIG_PACKAGE_ALFRED_VIS is not set diff --git a/bsp/default/root_file_system/usr/lib/micron.d/default b/bsp/default/root_file_system/usr/lib/micron.d/default index 89f0e79..3dbf3d7 100644 --- a/bsp/default/root_file_system/usr/lib/micron.d/default +++ b/bsp/default/root_file_system/usr/lib/micron.d/default @@ -1,3 +1,2 @@ -*/5 * * * * sleep $(/usr/bin/random 0 29); sh /etc/fastdstart.sh; sh /etc/nodewatcher.sh; sleep $(/usr/bin/random 0 209); sh /etc/configurator.sh -*/30 * * * * sleep $(/usr/bin/random 0 1790); /etc/syncHostname.sh +*/5 * * * * sleep $(/usr/bin/random 0 29); sh /etc/fastdstart.sh */1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw client diff --git a/bsp/wdr4300/.config b/bsp/wdr4300/.config index 3257cee..9860805 100644 --- a/bsp/wdr4300/.config +++ b/bsp/wdr4300/.config @@ -23,7 +23,7 @@ CONFIG_KMOD_BATMAN_ADV_LEGACY_BATCTL=y CONFIG_KMOD_BATMAN_ADV_LEGACY_BLA=y CONFIG_KMOD_BATMAN_ADV_LEGACY_DAT=y CONFIG_KMOD_BATMAN_ADV_LEGACY_NC=y -CONFIG_PACKAGE_alfred=y +# CONFIG_PACKAGE_ALFRED_VIS is not set CONFIG_PACKAGE_arptables=y # CONFIG_PACKAGE_dnsmasq is not set CONFIG_PACKAGE_ebtables=y @@ -61,8 +61,6 @@ CONFIG_PACKAGE_kmod-sched-connmark=y CONFIG_PACKAGE_kmod-sched-core=y CONFIG_PACKAGE_kmod-stp=y CONFIG_PACKAGE_kmod-tun=y -CONFIG_PACKAGE_libpthread=y -CONFIG_PACKAGE_librt=y CONFIG_PACKAGE_libugpio=y # CONFIG_PACKAGE_odhcpd is not set # CONFIG_PACKAGE_opkg is not set @@ -74,4 +72,3 @@ CONFIG_PACKAGE_wireless-tools=y # CONFIG_FASTD_ENABLE_MAC_GHASH is not set # CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set # CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set -# CONFIG_PACKAGE_ALFRED_VIS is not set diff --git a/bsp/wdr4900/.config b/bsp/wdr4900/.config index 64aef2f..dce599c 100644 --- a/bsp/wdr4900/.config +++ b/bsp/wdr4900/.config @@ -23,7 +23,7 @@ CONFIG_KMOD_BATMAN_ADV_LEGACY_BATCTL=y CONFIG_KMOD_BATMAN_ADV_LEGACY_BLA=y CONFIG_KMOD_BATMAN_ADV_LEGACY_DAT=y CONFIG_KMOD_BATMAN_ADV_LEGACY_NC=y -CONFIG_PACKAGE_alfred=y +# CONFIG_PACKAGE_ALFRED_VIS is not set CONFIG_PACKAGE_arptables=y # CONFIG_PACKAGE_dnsmasq is not set CONFIG_PACKAGE_ebtables=y @@ -61,8 +61,6 @@ CONFIG_PACKAGE_kmod-sched-connmark=y CONFIG_PACKAGE_kmod-sched-core=y CONFIG_PACKAGE_kmod-stp=y CONFIG_PACKAGE_kmod-tun=y -CONFIG_PACKAGE_libpthread=y -CONFIG_PACKAGE_librt=y CONFIG_PACKAGE_libugpio=y # CONFIG_PACKAGE_odhcpd is not set # CONFIG_PACKAGE_opkg is not set @@ -74,4 +72,3 @@ CONFIG_PACKAGE_wireless-tools=y # CONFIG_FASTD_ENABLE_MAC_GHASH is not set # CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set # CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set -# CONFIG_PACKAGE_ALFRED_VIS is not set diff --git a/community/aux.cfg b/community/aux.cfg index 8a3bbcb..3bed7cf 100644 --- a/community/aux.cfg +++ b/community/aux.cfg @@ -3,7 +3,6 @@ BATMAN_CHANNEL_5GHZ=36 ESSID_AP=aux.franken.freifunk.net ESSID_MESH=batman.franken.freifunk.net BSSID_MESH=CA:FF:EE:BA:BE:01 -NETMON_IP=fe80::ff:feee:1 VPN_PROJECT=fffaux NTPD_IP=fe80::ff:feee:1%br-mesh UPGRADE_PATH=http://[fe80::ff:feee:1%br-mesh]/dev/firmware/aux/current/ diff --git a/community/franken.cfg b/community/franken.cfg index 8f65307..27c1f14 100644 --- a/community/franken.cfg +++ b/community/franken.cfg @@ -3,7 +3,6 @@ BATMAN_CHANNEL_5GHZ=36 ESSID_AP=franken.freifunk.net ESSID_MESH=batman.franken.freifunk.net BSSID_MESH=02:CA:FF:EE:BA:BE -NETMON_IP=fe80::ff:feee:1 VPN_PROJECT=fff NTPD_IP=fe80::ff:feee:1%br-mesh -UPGRADE_PATH=http://[fe80::ff:feee:1%br-mesh]/dev/firmware/current/ \ No newline at end of file +UPGRADE_PATH=http://[fe80::ff:feee:1%br-mesh]/dev/firmware/current/ diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile new file mode 100644 index 0000000..b578db0 --- /dev/null +++ b/src/packages/fff/fff-nodewatcher/Makefile @@ -0,0 +1,42 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=fff-nodewatcher +PKG_VERSION:=35 +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher + +include $(INCLUDE_DIR)/package.mk + +define Package/fff-nodewatcher + SECTION:=base + CATEGORY:=Freifunk + TITLE:= Freifunk-Franken Nodewatcher + URL:=http://www.freifunk-franken.de + DEPENDS:=+alfred +micrond +endef + +define Package/fff-nodewatcher/description + This is the Nodewatcher for the Freifunk Franken Firmware + It is used to send node status information to + monitoring.freifunk-franken.de and + netmon.freifunk-franken.de +endef + +define Build/Prepare + echo "all: " > $(PKG_BUILD_DIR)/Makefile +endef + +define Build/Configure + # nothing +endef + +define Build/Compile + # nothing +endef + +define Package/fff-nodewatcher/install + $(CP) ./files/* $(1)/ +endef + +$(eval $(call BuildPackage,fff-nodewatcher)) diff --git a/bsp/default/root_file_system/etc/config/configurator.tpl b/src/packages/fff/fff-nodewatcher/files/etc/config/configurator similarity index 85% rename from bsp/default/root_file_system/etc/config/configurator.tpl rename to src/packages/fff/fff-nodewatcher/files/etc/config/configurator index af3d49a..62b0681 100644 --- a/bsp/default/root_file_system/etc/config/configurator.tpl +++ b/src/packages/fff/fff-nodewatcher/files/etc/config/configurator @@ -7,7 +7,7 @@ config 'script' config 'api' option 'ipv4_address' '1' option 'ipv6_interface' 'br-mesh' - option 'ipv6_address' '${NETMON_IP}' + option 'ipv6_address' 'fe80::ff:feee:1' option 'timeout' '5' option 'retry' '5' option 'api_key' '1' @@ -21,4 +21,4 @@ config 'crawl' option 'update_hash' '1' config 'netmon' - option 'autoadd_ipv6_address' '1' \ No newline at end of file + option 'autoadd_ipv6_address' '1' diff --git a/bsp/default/root_file_system/etc/config/nodewatcher b/src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher similarity index 100% rename from bsp/default/root_file_system/etc/config/nodewatcher rename to src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher diff --git a/bsp/default/root_file_system/etc/hotplug.d/iface/51-configurator b/src/packages/fff/fff-nodewatcher/files/etc/hotplug.d/iface/51-configurator similarity index 71% rename from bsp/default/root_file_system/etc/hotplug.d/iface/51-configurator rename to src/packages/fff/fff-nodewatcher/files/etc/hotplug.d/iface/51-configurator index b3368d6..cfa98e5 100755 --- a/bsp/default/root_file_system/etc/hotplug.d/iface/51-configurator +++ b/src/packages/fff/fff-nodewatcher/files/etc/hotplug.d/iface/51-configurator @@ -1,4 +1,4 @@ #!/bin/sh [ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && { - sh /etc/configurator.sh + /usr/sbin/configurator } diff --git a/src/packages/fff/fff-nodewatcher/files/usr/lib/micron.d/fff-nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/lib/micron.d/fff-nodewatcher new file mode 100644 index 0000000..9577999 --- /dev/null +++ b/src/packages/fff/fff-nodewatcher/files/usr/lib/micron.d/fff-nodewatcher @@ -0,0 +1,2 @@ +*/5 * * * * sleep $(/usr/bin/random 0 29); /usr/sbin/nodewatcher; sleep $(/usr/bin/random 0 209); /usr/sbin/configurator +*/30 * * * * sleep $(/usr/bin/random 0 1790); /usr/sbin/syncHostname diff --git a/bsp/default/root_file_system/etc/configurator.sh b/src/packages/fff/fff-nodewatcher/files/usr/sbin/configurator old mode 100644 new mode 100755 similarity index 100% rename from bsp/default/root_file_system/etc/configurator.sh rename to src/packages/fff/fff-nodewatcher/files/usr/sbin/configurator diff --git a/bsp/default/root_file_system/etc/nodewatcher.sh b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher similarity index 100% rename from bsp/default/root_file_system/etc/nodewatcher.sh rename to src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher diff --git a/bsp/default/root_file_system/etc/syncHostname.sh b/src/packages/fff/fff-nodewatcher/files/usr/sbin/syncHostname similarity index 100% rename from bsp/default/root_file_system/etc/syncHostname.sh rename to src/packages/fff/fff-nodewatcher/files/usr/sbin/syncHostname diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile index 3e9a0e7..07e5c6e 100644 --- a/src/packages/fff/fff/Makefile +++ b/src/packages/fff/fff/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff PKG_VERSION:=0.0.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_BUILD_DIR:=$(BUILD_DIR)/fff @@ -14,7 +14,7 @@ define Package/fff-base DEFAULT:=y TITLE:= Freifunk-Franken Base URL:=http://www.freifunk-franken.de - DEPENDS:=+micrond + DEPENDS:=+micrond +fff-nodewatcher endef define Package/fff-base/description