X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=2a67b33dd7a155672cf3402724526d529a72180f;hp=3c5e1d87e40d9a90a07ca1a1d0b46f7fb87af761;hb=c10ce06b6b50db9d8cf3d7059de979cb468a44aa;hpb=30c8b259e1b7012f7c16c1ee5aeb1997e44dcbdc

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 3c5e1d87e..2a67b33dd 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -1,64 +1,216 @@
 include $(TOPDIR)/rules.mk
 
 PKG_BRANCH:=trunk
-PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH)
-PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p')
+
+ifeq ($(DUMP),)
+  USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1)
+endif
 
 PKG_NAME:=luci
-PKG_VERSION:=0.5+svn$(PKG_REV)
 PKG_RELEASE:=1
 
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
+ifeq ($(USELOCAL),1)
+  PKG_VERSION:=0.9+svn
+else
+  PKG_SOURCE_URL:=http://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH)
+  ifeq ($(DUMP),)
+    PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p')
+    PKG_VERSION:=0.9+svn$(PKG_REV)
+  endif
+  PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+  PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+  PKG_SOURCE_PROTO:=svn
+  PKG_SOURCE_VERSION:=$(PKG_REV)
+endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-# LUA_TARGET:=compile LUAC=$(BUILD_DIR_HOST)/lua/luac
+PKG_BUILD_DEPENDS:=libnotimpl
 LUA_TARGET:=source
+PKG_SELECTED_MODULES:=
 
 
 include $(INCLUDE_DIR)/package.mk
 
-define Build/Configure
-endef
+ifeq ($(USELOCAL),1)
+  define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(TAR) c -C ../../../ . \
+		--exclude=.pc --exclude=.svn --exclude=.git \
+		--exclude='boa-0*' --exclude='*.o' --exclude='*.so' \
+		--exclude=dist | \
+			tar x -C $(PKG_BUILD_DIR)/
+  endef
+endif
 
-define Build/Compile
-	$(MAKE) -C$(PKG_BUILD_DIR) build LUA_TARGET=$(LUA_TARGET)
+define Build/Configure
 endef
 
+### Templates ###
 
-define Package/luci/template
+define Package/luci/libtemplate
   SECTION:=admin
   CATEGORY:=Administration
   TITLE:=LuCI - Lua Configuration Interface
   URL:=http://luci.freifunk-halle.net/
   MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
+  SUBMENU:=LuCI Libraries
+  DEPENDS:=+luci-core
+endef
+
+define Package/luci/fftemplate
+  $(call Package/luci/libtemplate)
+  SUBMENU:=LuCI Freifunk Support (GERMAN ONLY)
+  DEPENDS:=+luci-mod-freifunk
 endef
 
+define Package/luci/httpdtemplate
+  $(call Package/luci/libtemplate)
+  SUBMENU:=LuCI Non-Forking HTTP-Daemon (EXPERIMENTAL)
+  DEPENDS:=+luci-httpd
+endef
+
+define Package/luci/i18ntemplate
+  $(call Package/luci/libtemplate)
+  SUBMENU:=LuCI Translations
+  DEPENDS:=+luci-web
+endef
+
+define Package/luci/thtemplate
+  $(call Package/luci/libtemplate)
+  SUBMENU:=LuCI Themes
+  DEPENDS:=+luci-web
+endef
+
+define Package/luci/webtemplate
+  $(call Package/luci/libtemplate)
+  SUBMENU:=LuCI Components
+endef
+
+
 define Package/luci/install/template
-	$(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+	$(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+	$(CP) -a $(PKG_BUILD_DIR)/$(2)/ipkg/* $(1)/CONTROL/ 2>/dev/null || true
+endef
+
+
+
+### Core package ###
+
+define Package/luci-core
+  $(call Package/luci/libtemplate)
+  DEPENDS:=+lua +luaposix +bitlib
+  TITLE:=LuCI core libraries
+endef
+
+define Package/luci-core/install
+	$(call Package/luci/install/template,$(1),libs/core)
+endef
+
+define Package/luci-core/config
+       choice
+               prompt "Build Target"
+               default PACKAGE_luci-core_source
+
+       config PACKAGE_luci-core_compile
+               bool "Precompiled"
+
+       config PACKAGE_luci-core_stripped
+               bool "Stripped"
+
+       config PACKAGE_luci-core_source
+               bool "Full Source"
+
+       endchoice
+endef
+
+ifneq ($(CONFIG_PACKAGE_luci-core_compile),)
+  LUA_TARGET:=compile
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-core_stripped),)
+  LUA_TARGET:=strip
+endif
+
+
+### Libraries ###
+define Package/luci-cbi
+  $(call Package/luci/libtemplate)
+  DEPENDS+=+luci-web +luci-uvl +luci-uci
+  TITLE:=Configuration Binding Interface
+endef
+
+define Package/luci-cbi/install
+	$(call Package/luci/install/template,$(1),libs/cbi)
+endef
+
+
+define Package/luci-uci
+  $(call Package/luci/libtemplate)
+  DEPENDS+=+libuci-lua
+  TITLE:=High-Level UCI API
+endef
+
+define Package/luci-uci/install
+	$(call Package/luci/install/template,$(1),libs/uci)
 endef
 
 
-define Package/luci
-  $(call Package/luci/template)
-  MENU:=1
-  DEPENDS:=+lua +luaposix
+define Package/luci-fastindex
+  $(call Package/luci/libtemplate)
+  TITLE:=Fastindex indexing module
 endef
 
-define Package/luci/install		
-	$(call Package/luci/install/template,$(1),core)
+define Package/luci-fastindex/install
+	$(call Package/luci/install/template,$(1),libs/fastindex)
+endef
+
+
+define Package/luci-http
+  $(call Package/luci/libtemplate)
+  TITLE:=HTTP Protocol implementation
+endef
+
+define Package/luci-http/install
+	$(call Package/luci/install/template,$(1),libs/http)
+endef
+
+
+define Package/luci-ipkg
+  $(call Package/luci/libtemplate)
+  TITLE:=LuCI IPKG/OPKG call abstraction library
+endef
+
+define Package/luci-ipkg/install
+	$(call Package/luci/install/template,$(1),libs/ipkg)
+endef
+
+
+define Package/luci-json
+  $(call Package/luci/libtemplate)
+  TITLE:=LuCI JSON Library
+endef
+
+define Package/luci-json/install
+	$(call Package/luci/install/template,$(1),libs/json)
+endef
+
+
+define Package/luci-sys
+  $(call Package/luci/libtemplate)
+  TITLE:=LuCI Linux/POSIX system library
+endef
+
+define Package/luci-sys/install
+	$(call Package/luci/install/template,$(1),libs/sys)
 endef
 
 
-### Web Packages ###
 define Package/luci-web
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-addons
-  TITLE:=LuCI - Webframework
+  $(call Package/luci/libtemplate)
+  DEPENDS+=+luci-http +luci-sys +luci-addons +luci-uci +luci-sgi-cgi
+  TITLE:=MVC Webframework
 endef
 
 define Package/luci-web/conffiles
@@ -66,77 +218,104 @@ define Package/luci-web/conffiles
 endef
 
 define Package/luci-web/install
-	$(call Package/luci/install/template,$(1),web)
-	$(call Package/luci/install/template,$(1),themes/fledermaus)
+	$(call Package/luci/install/template,$(1),libs/web)
+endef
+
+
+define Package/luci-uvl
+  $(call Package/luci/libtemplate)
+  DEPENDS+=+luci-sys +luci-uci +luci-core
+  TITLE:=UVL - UCI Validation Layer
+endef
+
+define Package/luci-uvl/install
+	$(call Package/luci/install/template,$(1),libs/uvl)
+endef
+
+
+
+### HTTPD ###
+
+define Package/luci-httpd
+  $(call Package/luci/httpdtemplate)
+  DEPENDS:=+luci-http +luasocket
+  TITLE:=Server Core
+endef
+
+define Package/luci-httpd/install
+	$(call Package/luci/install/template,$(1),libs/httpd)
 endef
 
 
 
 ### Community Packages ###
 
-define Package/luci-ff-halle
-  $(call Package/luci/template)
-  DEPENDS:=luci \
-   +luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \
+define Package/luci-freifunk-community
+  $(call Package/luci/fftemplate)
+  DEPENDS+= \
+   +luci-sgi-cgi +luci-app-splash +luci-app-olsr \
    +luci-app-ffwizard-leipzig \
-   +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
+   +luci-theme-fledermaus \
+   +luci-i18n-german \
+   +olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice \
    +kmod-tun +ip
-  TITLE:=Freifunk Halle Community Meta-Package
+  TITLE:=Freifunk Community Meta-Package
 endef
 
-define Package/luci-ff-halle/install
+define Package/luci-freifunk-community/install
+	$(call Package/luci/install/template,$(1),applications/freifunk-community)
 endef
 
+### Modules ###
 
-define Package/luci-ff-leipzig
-  $(call Package/luci/template)
-  DEPENDS:=luci \
-   +luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \
-   +luci-app-ffwizard-leipzig \
-   +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
-   +kmod-tun +ip
-  TITLE:=Freifunk Leipzig Community Meta-Package
+define Package/luci-admin-core
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-web +luci-cbi +luci-theme-openwrt +luci-i18n-english
+  TITLE:=Web UI Core Module
 endef
 
-define Package/luci-ff-leipzig/install
-	$(call Package/luci/install/template,$(1),applications/community-leipzig)
-	$(CP) -a ./ipkg/luci-ff-leipzig.postinst $(1)/CONTROL/postinst
+define Package/luci-admin-core/install
+	$(call Package/luci/install/template,$(1),modules/admin-core)
 endef
 
 
-define Package/luci-ff-hannover
-  $(call Package/luci/template)
-  DEPENDS:=luci \
-   +luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \
-   +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice
-  TITLE:=Freifunk Hannover Community Meta-Package
-  URL:=http://www.freifunk-hannover.de/
-  MAINTAINER:=Mickey Knox <mickey-at-netfreaks-dot-org>
+define Package/luci-admin-mini
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-core
+  TITLE:=LuCI Essentials - stripped down and user-friendly
 endef
 
-define Package/luci-ff-hannover/install
-	$(call Package/luci/install/template,$(1),applications/community-hannover)
-	$(CP) -a ./ipkg/luci-ff-hannover.postinst $(1)/CONTROL/postinst
+define Package/luci-admin-mini/install
+	$(call Package/luci/install/template,$(1),modules/admin-mini)
 endef
 
 
-### Modules ###
+define Package/luci-admin-full
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-core +luci-ipkg
+  TITLE:=LuCI Administration - full-featured for full control
+endef
 
-define Package/luci-mod-admin-core
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-web +luci-app-cbi
-  TITLE:=Core administrative pages
+define Package/luci-admin-full/install
+	$(call Package/luci/install/template,$(1),modules/admin-full)
 endef
 
-define Package/luci-mod-admin-core/install
-	$(call Package/luci/install/template,$(1),modules/admin-core)
+
+define Package/luci-admin-rpc
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-json
+  TITLE:=LuCI RPC - JSON-RPC API
+endef
+
+define Package/luci-admin-rpc/install
+	$(call Package/luci/install/template,$(1),modules/rpc)
 endef
 
 
 define Package/luci-mod-freifunk
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-admin-core +luci-app-firewall
-  TITLE:=Freifunk public and administrative pages
+  $(call Package/luci/fftemplate)
+  DEPENDS:=+luci-admin-full
+  TITLE:=LuCI Freifunk module
 endef
 
 define Package/luci-mod-freifunk/conffiles
@@ -151,20 +330,8 @@ endef
 
 ### Applications ###
 
-define Package/luci-app-cbi
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-web
-  TITLE:=Configuration Binding Interface
-endef
-
-define Package/luci-app-cbi/install
-	$(call Package/luci/install/template,$(1),applications/cbi)
-endef
-
-
 define Package/luci-app-ffwizard-leipzig
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-freifunk
+  $(call Package/luci/fftemplate)
   TITLE:=Freifunk Leipzig configuration wizard
 endef
 
@@ -174,24 +341,41 @@ endef
 
 
 define Package/luci-app-firewall
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-admin-core
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-core
   TITLE:=Firewall and Portforwarding application
 endef
 
-define Package/luci-app-firewall/conffiles
-/etc/config/luci_fw
-endef
-
 define Package/luci-app-firewall/install
 	$(call Package/luci/install/template,$(1),applications/luci-fw)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-fw/dist/etc/init.d/luci_fw $(1)/etc/init.d
+endef
+
+
+define Package/luci-app-olsr
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-full +olsrd-luci +olsrd-luci-mod-txtinfo
+  TITLE:=OLSR configuration and status module
+endef
+
+define Package/luci-app-olsr/install
+	$(call Package/luci/install/template,$(1),applications/luci-olsr)
+endef
+
+
+define Package/luci-app-qos
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-core +qos-scripts
+  TITLE:=Quality of Service configuration module
+endef
+
+define Package/luci-app-qos/install
+	$(call Package/luci/install/template,$(1),applications/luci-qos)
 endef
 
 
 define Package/luci-app-splash
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-freifunk +luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt
+  $(call Package/luci/fftemplate)
+  DEPENDS+=+luasocket
   TITLE:=Freifunk DHCP-Splash application
 endef
 
@@ -201,18 +385,13 @@ endef
 
 define Package/luci-app-splash/install
 	$(call Package/luci/install/template,$(1),applications/luci-splash)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/sbin/luci-splash $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/init.d/luci_splash $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/cron.minutely/luci_splash $(1)/etc/cron.minutely
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi $(1)/usr/lib/luci-splash/htdocs/cgi-bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/www/cgi-bin/luci-splash $(1)/www/cgi-bin/luci-splash
 endef
 
 
 define Package/luci-app-statistics
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1
-  TITLE:=LuCI Statistics Application (incomplete)
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-full +collectd +collectd-mod-rrdtool1 +rrdtool1
+  TITLE:=LuCI Statistics Application
 endef
 
 define Package/luci-app-statistics/conffiles
@@ -221,53 +400,357 @@ endef
 
 define Package/luci-app-statistics/install
 	$(call Package/luci/install/template,$(1),applications/luci-statistics)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/usr/bin/stat-genconfig $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/etc/init.d/luci_statistics $(1)/etc/init.d
+endef
+
+
+define Package/luci-app-upnp
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-core +miniupnpd
+  TITLE:=Universal Plug & Play configuration module
+endef
+
+define Package/luci-app-upnp/install
+	$(call Package/luci/install/template,$(1),applications/luci-upnp)
+endef
+
+
+define Package/luci-app-ntpc
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-core +ntpclient
+  TITLE:=NTP time synchronisation client configuration module
+endef
+
+define Package/luci-app-ntpc/install
+	$(call Package/luci/install/template,$(1),applications/luci-ntpc)
+endef
+
+
+define Package/luci-app-ddns
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-core +ddns-scripts
+  TITLE:=Dynamic DNS configuration module
+endef
+
+define Package/luci-app-ddns/install
+	$(call Package/luci/install/template,$(1),applications/luci-ddns)
+endef
+
+
+define Package/luci-app-samba
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-full +samba3
+  TITLE:=Network Shares - Samba SMB/CIFS module
+endef
+
+define Package/luci-app-samba/install
+	$(call Package/luci/install/template,$(1),applications/luci-samba)
+endef
+
+
+define Package/luci-app-uvc_streamer
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-full +uvc-streamer
+  TITLE:=Webcam Streaming - UVC-Streamer module
+endef
+
+define Package/luci-app-uvc_streamer/install
+        $(call Package/luci/install/template,$(1),applications/luci-uvc_streamer)
+endef
+
+
+define Package/luci-app-p910nd
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-admin-full +p910nd
+  TITLE:=p910nd - Printer server module
+endef
+
+define Package/luci-app-p910nd/install
+        $(call Package/luci/install/template,$(1),applications/luci-p910nd)
 endef
 
 
 ### Server Gateway Interfaces ###
 
-define Package/luci-sgi-haserl
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-web +haserl-lua
-  TITLE:=SGI for Haserl
+define Package/luci-sgi-cgi
+  $(call Package/luci/libtemplate)
+  TITLE:=SGI for CGI
 endef
 
-define Package/luci-sgi-haserl/install
-	$(call Package/luci/install/template,$(1),applications/sgi-haserl)
-	$(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst
+define Package/luci-sgi-cgi/install
+	$(call Package/luci/install/template,$(1),libs/sgi-cgi)
 endef
 
+define Package/luci-sgi-luci
+  $(call Package/luci/libtemplate)
+  DEPENDS+=+luci-httpd
+  TITLE:=SGI for LuCI HTTPD
+endef
+
+define Package/luci-sgi-luci/install
+	$(call Package/luci/install/template,$(1),libs/sgi-luci)
+endef
 
 define Package/luci-sgi-webuci
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-web
+  $(call Package/luci/libtemplate)
   TITLE:=SGI for Webuci
 endef
 
 define Package/luci-sgi-webuci/install
-	$(call Package/luci/install/template,$(1),applications/sgi-webuci)
+	$(call Package/luci/install/template,$(1),libs/sgi-webuci)
+endef
+
+### Themes ###
+define Package/luci-theme-fledermaus
+  $(call Package/luci/fftemplate)
+  DEPENDS:=+luci-web
+  TITLE:=Fledermaus Theme
+endef
+
+define Package/luci-theme-fledermaus/install
+	$(call Package/luci/install/template,$(1),themes/fledermaus)
+endef
+
+define Package/luci-theme-openwrt
+  $(call Package/luci/thtemplate)
+  TITLE:=OpenWRT.org (default)
 endef
 
+define Package/luci-theme-openwrt/install
+	$(call Package/luci/install/template,$(1),themes/openwrt.org)
+endef
+
+define Package/luci-theme-openwrtlight
+  $(call Package/luci/thtemplate)
+  TITLE:=OpenWRT.org - light variant without images
+endef
+
+define Package/luci-theme-openwrtlight/install
+	$(call Package/luci/install/template,$(1),themes/openwrt-light)
+endef
+
+
+### Translations ###
+define Package/luci-i18n-german
+  $(call Package/luci/i18ntemplate)
+  TITLE:=German
+endef
+
+define Package/luci-i18n-german/install
+	$(call Package/luci/install/template,$(1),i18n/german)
+endef
 
 
+define Package/luci-i18n-english
+  $(call Package/luci/i18ntemplate)
+  TITLE:=English
+endef
+
+define Package/luci-i18n-english/install
+	$(call Package/luci/install/template,$(1),i18n/english)
+endef
+
+
+define Package/luci-i18n-french
+  $(call Package/luci/i18ntemplate)
+  TITLE:=French (by Florian Fainelli)
+endef
 
-$(eval $(call BuildPackage,luci))
+define Package/luci-i18n-french/install
+	$(call Package/luci/install/template,$(1),i18n/french)
+endef
+
+
+define Package/luci-i18n-russian
+  $(call Package/luci/i18ntemplate)
+  TITLE:=Russian (by Skryabin Dmitry)
+endef
+
+define Package/luci-i18n-russian/install
+	$(call Package/luci/install/template,$(1),i18n/russian)
+endef
+
+
+
+### Compile ###
+ifneq ($(CONFIG_PACKAGE_luci-core),)
+	PKG_SELECTED_MODULES+=libs/core
+endif
+ifneq ($(CONFIG_PACKAGE_luci-cbi),)
+	PKG_SELECTED_MODULES+=libs/cbi
+endif
+ifneq ($(CONFIG_PACKAGE_luci-fastindex),)
+	PKG_SELECTED_MODULES+=libs/fastindex
+endif
+ifneq ($(CONFIG_PACKAGE_luci-http),)
+	PKG_SELECTED_MODULES+=libs/http
+endif
+ifneq ($(CONFIG_PACKAGE_luci-ipkg),)
+	PKG_SELECTED_MODULES+=libs/ipkg
+endif
+ifneq ($(CONFIG_PACKAGE_luci-json),)
+	PKG_SELECTED_MODULES+=libs/json
+endif
+ifneq ($(CONFIG_PACKAGE_luci-uci),)
+	PKG_SELECTED_MODULES+=libs/uci
+endif
+ifneq ($(CONFIG_PACKAGE_luci-sys),)
+	PKG_SELECTED_MODULES+=libs/sys
+endif
+ifneq ($(CONFIG_PACKAGE_luci-web),)
+	PKG_SELECTED_MODULES+=libs/web
+endif
+ifneq ($(CONFIG_PACKAGE_luci-uvl),)
+	PKG_SELECTED_MODULES+=libs/uvl
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-httpd),)
+	PKG_SELECTED_MODULES+=libs/httpd
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-admin-core),)
+	PKG_SELECTED_MODULES+=modules/admin-core
+endif
+ifneq ($(CONFIG_PACKAGE_luci-admin-mini),)
+	PKG_SELECTED_MODULES+=modules/admin-mini
+endif
+ifneq ($(CONFIG_PACKAGE_luci-admin-full),)
+	PKG_SELECTED_MODULES+=modules/admin-full
+endif
+ifneq ($(CONFIG_PACKAGE_luci-admin-rpc),)
+	PKG_SELECTED_MODULES+=modules/rpc
+endif
+ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk),)
+	PKG_SELECTED_MODULES+=modules/freifunk
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-freifunk-community),)
+	PKG_SELECTED_MODULES+=applications/freifunk-community
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-app-ffwizard-leipzig),)
+	PKG_SELECTED_MODULES+=applications/luci-ffwizard-leipzig
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-firewall),)
+	PKG_SELECTED_MODULES+=applications/luci-fw
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-olsr),)
+	PKG_SELECTED_MODULES+=applications/luci-olsr
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-qos),)
+	PKG_SELECTED_MODULES+=applications/luci-qos
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-splash),)
+	PKG_SELECTED_MODULES+=applications/luci-splash
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-statistics),)
+	PKG_SELECTED_MODULES+=applications/luci-statistics
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-upnp),)
+	PKG_SELECTED_MODULES+=applications/luci-upnp
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-ntpc),)
+	PKG_SELECTED_MODULES+=applications/luci-ntpc
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-ddns),)
+	PKG_SELECTED_MODULES+=applications/luci-ddns
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-samba),)
+	PKG_SELECTED_MODULES+=applications/luci-samba
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-uvc_streamer),)
+	PKG_SELECTED_MODULES+=applications/luci-uvc_streamer
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-p910nd),)
+        PKG_SELECTED_MODULES+=applications/luci-p910nd
+endif
+
+
+ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),)
+	PKG_SELECTED_MODULES+=libs/sgi-cgi
+endif
+ifneq ($(CONFIG_PACKAGE_luci-sgi-luci),)
+	PKG_SELECTED_MODULES+=libs/sgi-luci
+endif
+ifneq ($(CONFIG_PACKAGE_luci-sgi-webuci),)
+	PKG_SELECTED_MODULES+=libs/sgi-webuci
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-theme-fledermaus),)
+	PKG_SELECTED_MODULES+=themes/fledermaus
+endif
+ifneq ($(CONFIG_PACKAGE_luci-theme-openwrt),)
+	PKG_SELECTED_MODULES+=themes/openwrt.org
+endif
+ifneq ($(CONFIG_PACKAGE_luci-theme-openwrtlight),)
+	PKG_SELECTED_MODULES+=themes/openwrt-light
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-i18n-german),)
+	PKG_SELECTED_MODULES+=i18n/german
+endif
+ifneq ($(CONFIG_PACKAGE_luci-i18n-english),)
+	PKG_SELECTED_MODULES+=i18n/english
+endif
+ifneq ($(CONFIG_PACKAGE_luci-i18n-french),)
+	PKG_SELECTED_MODULES+=i18n/french
+endif
+ifneq ($(CONFIG_PACKAGE_luci-i18n-russian),)
+	PKG_SELECTED_MODULES+=i18n/russian
+endif
+
+
+MAKE_FLAGS += \
+	MODULES="$(PKG_SELECTED_MODULES)" \
+	LUA_TARGET="$(LUA_TARGET)" \
+	LUA_SHLIBS="-llua -lm" \
+	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+	LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
+	OS="Linux"
+
+
+$(eval $(call BuildPackage,luci-core))
+$(eval $(call BuildPackage,luci-cbi))
+$(eval $(call BuildPackage,luci-fastindex))
+$(eval $(call BuildPackage,luci-http))
+$(eval $(call BuildPackage,luci-ipkg))
+$(eval $(call BuildPackage,luci-json))
+$(eval $(call BuildPackage,luci-uci))
+$(eval $(call BuildPackage,luci-sys))
 $(eval $(call BuildPackage,luci-web))
+$(eval $(call BuildPackage,luci-uvl))
 
-$(eval $(call BuildPackage,luci-ff-halle))
-$(eval $(call BuildPackage,luci-ff-leipzig))
-$(eval $(call BuildPackage,luci-ff-hannover))
+$(eval $(call BuildPackage,luci-httpd))
 
-$(eval $(call BuildPackage,luci-mod-admin-core))
+$(eval $(call BuildPackage,luci-admin-core))
+$(eval $(call BuildPackage,luci-admin-mini))
+$(eval $(call BuildPackage,luci-admin-full))
+$(eval $(call BuildPackage,luci-admin-rpc))
 $(eval $(call BuildPackage,luci-mod-freifunk))
 
-$(eval $(call BuildPackage,luci-app-cbi))
+$(eval $(call BuildPackage,luci-freifunk-community))
+
 $(eval $(call BuildPackage,luci-app-ffwizard-leipzig))
 $(eval $(call BuildPackage,luci-app-firewall))
+$(eval $(call BuildPackage,luci-app-olsr))
+$(eval $(call BuildPackage,luci-app-qos))
 $(eval $(call BuildPackage,luci-app-splash))
 $(eval $(call BuildPackage,luci-app-statistics))
-
-$(eval $(call BuildPackage,luci-sgi-haserl))
+$(eval $(call BuildPackage,luci-app-upnp))
+$(eval $(call BuildPackage,luci-app-ntpc))
+$(eval $(call BuildPackage,luci-app-ddns))
+$(eval $(call BuildPackage,luci-app-samba))
+$(eval $(call BuildPackage,luci-app-uvc_streamer))
+$(eval $(call BuildPackage,luci-app-p910nd))
+
+$(eval $(call BuildPackage,luci-sgi-cgi))
+$(eval $(call BuildPackage,luci-sgi-luci))
 $(eval $(call BuildPackage,luci-sgi-webuci))
+
+$(eval $(call BuildPackage,luci-theme-fledermaus))
+$(eval $(call BuildPackage,luci-theme-openwrt))
+$(eval $(call BuildPackage,luci-theme-openwrtlight))
+
+$(eval $(call BuildPackage,luci-i18n-german))
+$(eval $(call BuildPackage,luci-i18n-english))
+$(eval $(call BuildPackage,luci-i18n-french))
+$(eval $(call BuildPackage,luci-i18n-russian))