From 4e145b83b9c40665fe94a24f681df74798727468 Mon Sep 17 00:00:00 2001
From: Jan Kraus <mayosemmel@googlemail.com>
Date: Mon, 16 May 2016 14:26:49 +0200
Subject: [PATCH] Moved network configuration script to own package

Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
Reviewed-by: Tim Niemeyer <tim@tn-x.org>
Changed mode of configurenetwork to 755
Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---
 bsp/default/root_file_system/etc/rc.local.tpl |  4 +-
 src/packages/fff/fff-network/Makefile         | 39 +++++++++++++++++++
 .../files/usr/sbin/configurenetwork           |  3 ++
 src/packages/fff/fff/Makefile                 |  3 +-
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 src/packages/fff/fff-network/Makefile
 rename bsp/default/root_file_system/etc/network.sh => src/packages/fff/fff-network/files/usr/sbin/configurenetwork (98%)
 mode change 100644 => 100755

diff --git a/bsp/default/root_file_system/etc/rc.local.tpl b/bsp/default/root_file_system/etc/rc.local.tpl
index 5a18675..74d3ba1 100755
--- a/bsp/default/root_file_system/etc/rc.local.tpl
+++ b/bsp/default/root_file_system/etc/rc.local.tpl
@@ -59,9 +59,7 @@ if ! uci get board.model.name; then
     uci set board.model.name=$BOARD
 fi
 
-. /etc/network.$BOARD
-
-. /etc/network.sh
+/usr/sbin/configurenetwork
 
 # Starting NTP-Client Daemon after 30s to ensure that the interface is up
 ( sleep 30 ; ntpd -p ${NTPD_IP} ) &
diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
new file mode 100644
index 0000000..a803afe
--- /dev/null
+++ b/src/packages/fff/fff-network/Makefile
@@ -0,0 +1,39 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fff-network
+PKG_VERSION:=0.0.1
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/fff-network
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fff-network
+    SECTION:=base
+    CATEGORY:=Freifunk
+    TITLE:= Freifunk-Franken network configuration
+    URL:=http://www.freifunk-franken.de
+    DEPENDS:=+fff-uradvd
+endef
+
+define Package/fff-network/description
+    This package configures the network interfaces
+endef
+
+define Build/Prepare
+	echo "all: " > $(PKG_BUILD_DIR)/Makefile
+endef
+
+define Build/Configure
+	# nothing
+endef
+
+define Build/Compile
+	# nothing
+endef
+
+define Package/fff-network/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,fff-network))
diff --git a/bsp/default/root_file_system/etc/network.sh b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
old mode 100644
new mode 100755
similarity index 98%
rename from bsp/default/root_file_system/etc/network.sh
rename to src/packages/fff/fff-network/files/usr/sbin/configurenetwork
index 1a595a5..4122322
--- a/bsp/default/root_file_system/etc/network.sh
+++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
@@ -9,6 +9,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+BOARD="$(uci get board.model.name)"
+. /etc/network.$BOARD
+
 if ! uci get nodewatcher.@network[0].client_interfaces; then
     echo "Setting nodewatchers client interfaces to: $CLIENTIF"
     uci set nodewatcher.@network[0].client_interfaces="$CLIENTIF"
diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
index 80ae83b..52ccc14 100644
--- a/src/packages/fff/fff/Makefile
+++ b/src/packages/fff/fff/Makefile
@@ -21,7 +21,8 @@ define Package/fff-base
              +fff-batman-adv-legacy \
              +fff-fastd \
              +fff-firewall \
-             +fff-support
+             +fff-support \
+             +fff-network
 endef
 
 define Package/fff-base/description