From patchwork Fri Jul 26 13:33:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC,2/5] fff-web: Make fff-web depend on fff-web-hood From: Adrian Schmutzler X-Patchwork-Id: 1161 Message-Id: <20190726133311.3985-3-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Fri, 26 Jul 2019 15:33:08 +0200 This makes fff-web-hood a dependency of the fff-web package, so its functionality can be derived. Signed-off-by: Adrian Schmutzler --- src/packages/fff/fff-web/Makefile | 2 +- .../etc/uci-defaults/{93-fff-uhttpd => 94-fff-web-ui} | 10 ---------- src/packages/fff/fff-web/files/www/hood/.keep | 0 3 files changed, 1 insertion(+), 11 deletions(-) rename src/packages/fff/fff-web/files/etc/uci-defaults/{93-fff-uhttpd => 94-fff-web-ui} (77%) delete mode 100644 src/packages/fff/fff-web/files/www/hood/.keep diff --git a/src/packages/fff/fff-web/files/www/hood/.keep b/src/packages/fff/fff-web/files/www/hood/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile index a98d97f8..36f3ec96 100644 --- a/src/packages/fff/fff-web/Makefile +++ b/src/packages/fff/fff-web/Makefile @@ -13,7 +13,7 @@ define Package/$(PKG_NAME) CATEGORY:=Freifunk TITLE:= Freifunk-Franken Webinterface URL:=http://www.freifunk-franken.de - DEPENDS:=+uhttpd +libustream-mbedtls +haserl +px5g +simple-tc \ + DEPENDS:=+fff-web-hood +libustream-mbedtls +haserl +px5g +simple-tc \ +fff-boardname +fff-config +fff-network +fff-hoodutils \ +@BUSYBOX_CONFIG_WGET +@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT endef 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/94-fff-web-ui similarity index 77% rename from src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd rename to src/packages/fff/fff-web/files/etc/uci-defaults/94-fff-web-ui index 42376ad9..1fc55f5f 100644 --- a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd +++ b/src/packages/fff/fff-web/files/etc/uci-defaults/94-fff-web-ui @@ -1,8 +1,6 @@ #!/bin/sh uci batch <