Changeset 7771

Timestamp:

10/23/11 15:20:51 (19 months ago)

Author:

jow

Message:

contrib/package: complete rework of dependencies, should cure menuconfig issues

Location:

luci/trunk/contrib/package

Files:

• community-profiles/Makefile (modified) (1 diff)
• freifunk-common/Makefile (modified) (1 diff)
• freifunk-firewall/Makefile (modified) (1 diff)
• freifunk-gwcheck/Makefile (modified) (1 diff)
• freifunk-mapupdate/Makefile (modified) (1 diff)
• freifunk-p2pblock/Makefile (modified) (1 diff)
• freifunk-policyrouting/Makefile (modified) (1 diff)
• freifunk-watchdog/Makefile (modified) (1 diff)
• iwinfo/Makefile (modified) (1 diff)
• luci/Makefile (modified) (17 diffs)
• meshwizard/Makefile (modified) (1 diff)
• remote-update/Makefile (modified) (1 diff)

luci/trunk/contrib/package/community-profiles/Makefile

@@ -14 +14 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Community profiles
   DEPENDS:=freifunk-common

luci/trunk/contrib/package/freifunk-common/Makefile

@@ -14 +14 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Freifunk common files
 endef

luci/trunk/contrib/package/freifunk-firewall/Makefile

@@ -17 +17 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Freifunk Firewall Addon
   DEPENDS:=+firewall

luci/trunk/contrib/package/freifunk-gwcheck/Makefile

@@ -14 +14 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Freifunk gateway check script
-  DEPENDS:=+firewall +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain
+  DEPENDS:=firewall +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain
 endef
 

luci/trunk/contrib/package/freifunk-mapupdate/Makefile

@@ -14 +14 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Update script for freifunkmap
   DEPENDS:=+olsrd-mod-nameservice

luci/trunk/contrib/package/freifunk-p2pblock/Makefile

@@ -18 +18 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Freifunk p2pblock Addon
   DEPENDS:=+iptables-mod-filter +iptables-mod-ipp2p +l7-protocols +iptables-mod-conntrack-extra

luci/trunk/contrib/package/freifunk-policyrouting/Makefile

@@ -14 +14 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Freifunk policy routing addon
   DEPENDS:=+firewall +ip

luci/trunk/contrib/package/freifunk-watchdog/Makefile

@@ -19 +19 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Freifunk Ad-Hoc watchdog daemon
   DEPENDS:=libuci

luci/trunk/contrib/package/iwinfo/Makefile

@@ -18 +18 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Libraries
+  SUBMENU:=8. Libraries
   TITLE:=Generalized Wireless Information Library (iwinfo)
   DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +liblua +lua

luci/trunk/contrib/package/luci/Makefile

@@ -54 +54 @@
   URL:=http://luci.subsignal.org/
   MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-  SUBMENU:=Libraries
+  SUBMENU:=8. Libraries
   DEPENDS:=+lua +libuci-lua
   TITLE:=LuCI core libraries
@@ -115 +115 @@
     URL:=http://luci.subsignal.org/
     MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-    SUBMENU:=Libraries
+    SUBMENU:=8. Libraries
     TITLE:=$(if $(2),$(2),LuCI $(1) library)
     $(if $(3),DEPENDS:=+luci-lib-core $(3))
@@ -196 +196 @@
     URL:=http://luci.subsignal.org/
     MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-    SUBMENU:=Protocols
+    SUBMENU:=6. Protocols
     TITLE:=$(if $(2),$(2),LuCI $(1) protocol support)
-    $(if $(3),DEPENDS:=+luci-proto-core $(3))
+    DEPENDS:=$(3)
   endef
 
@@ -213 +213 @@
 
 $(eval $(call protocol,core,Support for static/dhcp/none))
-$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA,+PACKAGE_luci-proto-ppp:ppp-mod-pppoe))
-$(eval $(call protocol,pptp,Support for PPtP,+PACKAGE_luci-proto-pptp:pptp))
-$(eval $(call protocol,6x4,Support for 6in4/6to4,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4))
-$(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt))
-$(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd))
+$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA))
+$(eval $(call protocol,pptp,Support for PPtP,+pptp))
+$(eval $(call protocol,6x4,Support for 6in4/6to4,+6in4 +6to4))
+$(eval $(call protocol,3g,Support for 3G,+comgt))
+$(eval $(call protocol,relay,Support for relayd pseudo bridges,+relayd))
 
 
@@ -227 +227 @@
   URL:=http://luci.subsignal.org/
   MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Freifunk Community Meta-Package
   DEPENDS+= \
@@ -257 +257 @@
     URL:=http://luci.subsignal.org/
     MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-    SUBMENU:=Modules
+    SUBMENU:=2. Modules
     TITLE:=$(if $(2),$(2),LuCI $(1) module)
     $(if $(3),DEPENDS+=$(3))
@@ -279 +279 @@
 endef
 
-$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-proto-ppp +luci-i18n-english))
+$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-i18n-english))
 $(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core @BROKEN))
 $(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg))
@@ -295 +295 @@
     URL:=http://luci.subsignal.org/
     MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-    SUBMENU:=Applications
+    SUBMENU:=3. Applications
     TITLE:=$(if $(2),$(2),LuCI $(1) application)
     DEPENDS:=$(3)
@@ -340 +340 @@
 
 $(eval $(call application,olsr,OLSR configuration and status module,\
-    +PACKAGE_luci-app-olsr:olsrd +PACKAGE_luci-app-olsr:olsrd-mod-txtinfo))
+    +olsrd-mod-txtinfo))
 
 $(eval $(call application,olsr-viz,OLSR Visualisation,\
-    luci-app-olsr +PACKAGE_luci-app-olsr-viz:olsrd-mod-txtinfo))
+    luci-app-olsr +olsrd-mod-txtinfo))
 
 $(eval $(call application,olsr-services,Show services announced with the nameservice plugin,\
-    luci-app-olsr +PACKAGE_luci-app-olsr-services:olsrd-mod-nameservice))
+    luci-app-olsr +olsrd-mod-nameservice))
 
 $(eval $(call application,qos,Quality of Service configuration module,\
@@ -352 +352 @@
 
 $(eval $(call application,splash,Freifunk DHCP-Splash application,\
-    +luci-lib-nixio +PACKAGE_luci-app-splash:tc \
-    +PACKAGE_luci-app-splash:kmod-sched +PACKAGE_luci-app-splash:iptables-mod-nat-extra \
-    +PACKAGE_luci-app-splash:iptables-mod-ipopt))
+    +luci-lib-nixio +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt))
 
 $(eval $(call application,statistics,LuCI Statistics Application,\
@@ -415 +413 @@
 
 $(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,\
-    +luci-app-firewall +PACKAGE_luci-app-p2pblock:freifunk-p2pblock))
+    luci-app-firewall +PACKAGE_luci-app-p2pblock:freifunk-p2pblock))
 
 $(eval $(call application,multiwan,LuCI Support for the OpenWrt MultiWAN agent,\
-    +luci-app-firewall +PACKAGE_luci-app-multiwan:multiwan))
+    luci-app-firewall +PACKAGE_luci-app-multiwan:multiwan))
 
 $(eval $(call application,wol,LuCI Support for Wake-on-LAN,\
@@ -446 +444 @@
     URL:=http://luci.subsignal.org/
     MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-    SUBMENU:=Server Interfaces
+    SUBMENU:=7. Server Interfaces
     TITLE:=$(if $(2),$(2),LuCI $(1) server gateway interface)
-    $(if $(3),DEPENDS:=$(3))
+    DEPENDS:=$(3)
   endef
 
@@ -473 +471 @@
     TITLE:=LuCI - Lua Configuration Interface
     URL:=http://luci.subsignal.org/
-    SUBMENU:=Themes
+    SUBMENU:=4. Themes
     TITLE:=$(if $(2),$(2),LuCI $(1) theme)
     MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>)
@@ -491 +489 @@
 endef
 
-$(eval $(call theme,base,Common base for all themes,,+luci-lib-web))
+$(eval $(call theme,base,Common base for all themes))
 $(eval $(call theme,openwrt,OpenWrt.org (default),,,1))
 $(eval $(call theme,fledermaus,Fledermaus Theme))
@@ -515 +513 @@
     URL:=http://luci.subsignal.org/
     MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-    SUBMENU:=Translations
+    SUBMENU:=5. Translations
     TITLE:=$(if $(2),$(2),$(1))
   endef
@@ -557 +555 @@
     URL:=http://luci.subsignal.org/
     MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-    SUBMENU:=Collections
+    SUBMENU:=1. Collections
     TITLE:=$(if $(2),$(2),LuCI $(if $(1),$(1),general) collection)
     $(if $(3),DEPENDS:=$(3))
@@ -570 +568 @@
 
 $(eval $(call collection,,\
-    Standard OpenWrt set including full and mini admin and the standard theme,\
+    Standard OpenWrt set including full admin with ppp support and the \
+    default OpenWrt theme,\
     +uhttpd +luci-mod-admin-full +luci-theme-openwrt +luci-app-firewall \
-    +libiwinfo))
+    +luci-proto-core +luci-proto-ppp +libiwinfo))
 
 $(eval $(call collection,ssl,\
     Standard OpenWrt set with HTTPS support,\
-    +uhttpd +uhttpd-mod-tls +px5g +luci-mod-admin-full +luci-theme-openwrt \
-    +luci-app-firewall +libiwinfo))
+    +luci +uhttpd-mod-tls +px5g))
 
 $(eval $(call collection,light,\

luci/trunk/contrib/package/meshwizard/Makefile

@@ -14 +14 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Shell script based wizard for Mesh networks
   DEPENDS:=+firewall

luci/trunk/contrib/package/remote-update/Makefile

@@ -17 +17 @@
   SECTION:=luci
   CATEGORY:=LuCI
-  SUBMENU:=Freifunk
+  SUBMENU:=9. Freifunk
   TITLE:=Freifunk remote update utility.
   DEPENDS:=@TARGET_atheros||@TARGET_ar71xx||@TARGET_brcm_2_4