[PATCH] seperated fff-web from fff-base. This should make it easier to switch to a differnet ui package at a later time.

[Tim Niemeyer]

Hi

Hier erbitte ich mir etwas Zeit.

Tim

Am 27. Januar 2016 23:47:49 MEZ, schrieb Alexander Wunschik <freifunk at wunschik.net>:
>Signed-off-by: Alexander Wunschik <freifunk at wunschik.net>
>---
> buildscript                       | 2 +-
> src/packages/fff/fff-web/Makefile | 5 +++--
> src/packages/fff/fff/Makefile     | 4 ++--
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/buildscript b/buildscript
>index f159f26..d26652d 100755
>--- a/buildscript
>+++ b/buildscript
>@@ -40,7 +40,7 @@ ROUTING=(routing
> ROUTING_PKGS="alfred"
> 
> FFF=(fff)
>-FFF_PKGS="-a"
>+FFF_PKGS="fff-base fff-nodewatcher fff-web"
> 
> FEEDS=(OPENWRT ROUTING BATMAN_ADV FFF)
> 
>diff --git a/src/packages/fff/fff-web/Makefile
>b/src/packages/fff/fff-web/Makefile
>index aefcaa6..2e3b31d 100644
>--- a/src/packages/fff/fff-web/Makefile
>+++ b/src/packages/fff/fff-web/Makefile
>@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
> 
> PKG_NAME:=fff-web
> PKG_VERSION:=0.0.3
>-PKG_RELEASE:=1
>+PKG_RELEASE:=2
> 
> PKG_BUILD_DIR:=$(BUILD_DIR)/fff-web
> 
>@@ -11,13 +11,14 @@ include $(INCLUDE_DIR)/package.mk
> define Package/fff-web
>     SECTION:=base
>     CATEGORY:=Freifunk
>+    DEFAULT:=y
>     TITLE:= Freifunk-Franken Webinterface
>     URL:=http://www.freifunk-franken.de
>     DEPENDS:=+uhttpd +haserl +uhttpd-mod-tls +px5g +simple-tc
> endef
> 
> define Package/fff-web/description
>-    This is the Webinterface for the Freifunk Franken Firmware
>+    This is the default Webinterface for the Freifunk Franken Firmware
> endef
> 
> define Build/Prepare
>diff --git a/src/packages/fff/fff/Makefile
>b/src/packages/fff/fff/Makefile
>index e29713f..80b25a7 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:=4
>+PKG_RELEASE:=5
> 
> 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 +fff-nodewatcher +fff-web
>+    DEPENDS:=+micrond +fff-nodewatcher
> endef
> 
> define Package/fff-base/description