From de8f99005c59d1eb45b34e15884a434a4fc680e2 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 25 Apr 2020 23:27:43 +0200 Subject: [PATCH] fff-hoods/fff-web: create link to hood file in fff-hoods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the layer-3 firmware, we currently do not support a hood file for automatically creating a mesh. However, the link for the hood file is still created in fff-web. Move this setup to fff-hoods, which is specific to the node firmware. Signed-off-by: Adrian Schmutzler Reviewed-by: Fabian Bläse --- src/packages/fff/fff-hoods/Makefile | 2 +- .../fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile | 5 +++++ src/packages/fff/fff-web/Makefile | 2 +- .../fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd | 4 ---- 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-hoods/Makefile index 309e354..885599c 100644 --- a/src/packages/fff/fff-hoods/Makefile +++ b/src/packages/fff/fff-hoods/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-hoods -PKG_RELEASE:=11 +PKG_RELEASE:=12 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile b/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile new file mode 100644 index 0000000..a52646f --- /dev/null +++ b/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile @@ -0,0 +1,5 @@ +. /lib/functions/fff/keyxchange + +ln -s "$hoodfilewww" /www/hood/keyxchangev2data + +exit 0 diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile index 3f16fde..c0783b7 100644 --- a/src/packages/fff/fff-web/Makefile +++ b/src/packages/fff/fff-web/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-web -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd index f313537..fc26581 100644 --- a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd +++ b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd @@ -1,7 +1,3 @@ -. /lib/functions/fff/keyxchange - -ln -s "$hoodfilewww" /www/hood/keyxchangev2data - uci batch <