Changeset 7771

Show
Ignore:
Timestamp:
10/23/11 15:20:51 (3 years ago)
Author:
jow
Message:

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

Location:
luci/trunk/contrib/package
Files:
12 modified

Legend:

Unmodified
Added
Removed
  • luci/trunk/contrib/package/community-profiles/Makefile

    r7576 r7771  
    1414  SECTION:=luci 
    1515  CATEGORY:=LuCI 
    16   SUBMENU:=Freifunk 
     16  SUBMENU:=9. Freifunk 
    1717  TITLE:=Community profiles 
    1818  DEPENDS:=freifunk-common 
  • luci/trunk/contrib/package/freifunk-common/Makefile

    r7691 r7771  
    1414  SECTION:=luci 
    1515  CATEGORY:=LuCI 
    16   SUBMENU:=Freifunk 
     16  SUBMENU:=9. Freifunk 
    1717  TITLE:=Freifunk common files 
    1818endef 
  • luci/trunk/contrib/package/freifunk-firewall/Makefile

    r5310 r7771  
    1717  SECTION:=luci 
    1818  CATEGORY:=LuCI 
    19   SUBMENU:=Freifunk 
     19  SUBMENU:=9. Freifunk 
    2020  TITLE:=Freifunk Firewall Addon 
    2121  DEPENDS:=+firewall 
  • luci/trunk/contrib/package/freifunk-gwcheck/Makefile

    r7540 r7771  
    1414  SECTION:=luci 
    1515  CATEGORY:=LuCI 
    16   SUBMENU:=Freifunk 
     16  SUBMENU:=9. Freifunk 
    1717  TITLE:=Freifunk gateway check script 
    18   DEPENDS:=+firewall +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain 
     18  DEPENDS:=firewall +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain 
    1919endef 
    2020 
  • luci/trunk/contrib/package/freifunk-mapupdate/Makefile

    r7553 r7771  
    1414  SECTION:=luci 
    1515  CATEGORY:=LuCI 
    16   SUBMENU:=Freifunk 
     16  SUBMENU:=9. Freifunk 
    1717  TITLE:=Update script for freifunkmap 
    1818  DEPENDS:=+olsrd-mod-nameservice 
  • luci/trunk/contrib/package/freifunk-p2pblock/Makefile

    r7242 r7771  
    1818  SECTION:=luci 
    1919  CATEGORY:=LuCI 
    20   SUBMENU:=Freifunk 
     20  SUBMENU:=9. Freifunk 
    2121  TITLE:=Freifunk p2pblock Addon 
    2222  DEPENDS:=+iptables-mod-filter +iptables-mod-ipp2p +l7-protocols +iptables-mod-conntrack-extra 
  • luci/trunk/contrib/package/freifunk-policyrouting/Makefile

    r6967 r7771  
    1414  SECTION:=luci 
    1515  CATEGORY:=LuCI 
    16   SUBMENU:=Freifunk 
     16  SUBMENU:=9. Freifunk 
    1717  TITLE:=Freifunk policy routing addon 
    1818  DEPENDS:=+firewall +ip 
  • luci/trunk/contrib/package/freifunk-watchdog/Makefile

    r5359 r7771  
    1919  SECTION:=luci 
    2020  CATEGORY:=LuCI 
    21   SUBMENU:=Freifunk 
     21  SUBMENU:=9. Freifunk 
    2222  TITLE:=Freifunk Ad-Hoc watchdog daemon 
    2323  DEPENDS:=libuci 
  • luci/trunk/contrib/package/iwinfo/Makefile

    r7466 r7771  
    1818  SECTION:=luci 
    1919  CATEGORY:=LuCI 
    20   SUBMENU:=Libraries 
     20  SUBMENU:=8. Libraries 
    2121  TITLE:=Generalized Wireless Information Library (iwinfo) 
    2222  DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +liblua +lua 
  • luci/trunk/contrib/package/luci/Makefile

    r7734 r7771  
    5454  URL:=http://luci.subsignal.org/ 
    5555  MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org> 
    56   SUBMENU:=Libraries 
     56  SUBMENU:=8. Libraries 
    5757  DEPENDS:=+lua +libuci-lua 
    5858  TITLE:=LuCI core libraries 
     
    115115    URL:=http://luci.subsignal.org/ 
    116116    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org> 
    117     SUBMENU:=Libraries 
     117    SUBMENU:=8. Libraries 
    118118    TITLE:=$(if $(2),$(2),LuCI $(1) library) 
    119119    $(if $(3),DEPENDS:=+luci-lib-core $(3)) 
     
    196196    URL:=http://luci.subsignal.org/ 
    197197    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org> 
    198     SUBMENU:=Protocols 
     198    SUBMENU:=6. Protocols 
    199199    TITLE:=$(if $(2),$(2),LuCI $(1) protocol support) 
    200     $(if $(3),DEPENDS:=+luci-proto-core $(3)) 
     200    DEPENDS:=$(3) 
    201201  endef 
    202202 
     
    213213 
    214214$(eval $(call protocol,core,Support for static/dhcp/none)) 
    215 $(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA,+PACKAGE_luci-proto-ppp:ppp-mod-pppoe)) 
    216 $(eval $(call protocol,pptp,Support for PPtP,+PACKAGE_luci-proto-pptp:pptp)) 
    217 $(eval $(call protocol,6x4,Support for 6in4/6to4,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4)) 
    218 $(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt)) 
    219 $(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd)) 
     215$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA)) 
     216$(eval $(call protocol,pptp,Support for PPtP,+pptp)) 
     217$(eval $(call protocol,6x4,Support for 6in4/6to4,+6in4 +6to4)) 
     218$(eval $(call protocol,3g,Support for 3G,+comgt)) 
     219$(eval $(call protocol,relay,Support for relayd pseudo bridges,+relayd)) 
    220220 
    221221 
     
    227227  URL:=http://luci.subsignal.org/ 
    228228  MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org> 
    229   SUBMENU:=Freifunk 
     229  SUBMENU:=9. Freifunk 
    230230  TITLE:=Freifunk Community Meta-Package 
    231231  DEPENDS+= \ 
     
    257257    URL:=http://luci.subsignal.org/ 
    258258    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org> 
    259     SUBMENU:=Modules 
     259    SUBMENU:=2. Modules 
    260260    TITLE:=$(if $(2),$(2),LuCI $(1) module) 
    261261    $(if $(3),DEPENDS+=$(3)) 
     
    279279endef 
    280280 
    281 $(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-proto-ppp +luci-i18n-english)) 
     281$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-i18n-english)) 
    282282$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core @BROKEN)) 
    283283$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg)) 
     
    295295    URL:=http://luci.subsignal.org/ 
    296296    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org> 
    297     SUBMENU:=Applications 
     297    SUBMENU:=3. Applications 
    298298    TITLE:=$(if $(2),$(2),LuCI $(1) application) 
    299299    DEPENDS:=$(3) 
     
    340340 
    341341$(eval $(call application,olsr,OLSR configuration and status module,\ 
    342     +PACKAGE_luci-app-olsr:olsrd +PACKAGE_luci-app-olsr:olsrd-mod-txtinfo)) 
     342    +olsrd-mod-txtinfo)) 
    343343 
    344344$(eval $(call application,olsr-viz,OLSR Visualisation,\ 
    345     luci-app-olsr +PACKAGE_luci-app-olsr-viz:olsrd-mod-txtinfo)) 
     345    luci-app-olsr +olsrd-mod-txtinfo)) 
    346346 
    347347$(eval $(call application,olsr-services,Show services announced with the nameservice plugin,\ 
    348     luci-app-olsr +PACKAGE_luci-app-olsr-services:olsrd-mod-nameservice)) 
     348    luci-app-olsr +olsrd-mod-nameservice)) 
    349349 
    350350$(eval $(call application,qos,Quality of Service configuration module,\ 
     
    352352 
    353353$(eval $(call application,splash,Freifunk DHCP-Splash application,\ 
    354     +luci-lib-nixio +PACKAGE_luci-app-splash:tc \ 
    355     +PACKAGE_luci-app-splash:kmod-sched +PACKAGE_luci-app-splash:iptables-mod-nat-extra \ 
    356     +PACKAGE_luci-app-splash:iptables-mod-ipopt)) 
     354    +luci-lib-nixio +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt)) 
    357355 
    358356$(eval $(call application,statistics,LuCI Statistics Application,\ 
     
    415413 
    416414$(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,\ 
    417     +luci-app-firewall +PACKAGE_luci-app-p2pblock:freifunk-p2pblock)) 
     415    luci-app-firewall +PACKAGE_luci-app-p2pblock:freifunk-p2pblock)) 
    418416 
    419417$(eval $(call application,multiwan,LuCI Support for the OpenWrt MultiWAN agent,\ 
    420     +luci-app-firewall +PACKAGE_luci-app-multiwan:multiwan)) 
     418    luci-app-firewall +PACKAGE_luci-app-multiwan:multiwan)) 
    421419 
    422420$(eval $(call application,wol,LuCI Support for Wake-on-LAN,\ 
     
    446444    URL:=http://luci.subsignal.org/ 
    447445    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org> 
    448     SUBMENU:=Server Interfaces 
     446    SUBMENU:=7. Server Interfaces 
    449447    TITLE:=$(if $(2),$(2),LuCI $(1) server gateway interface) 
    450     $(if $(3),DEPENDS:=$(3)) 
     448    DEPENDS:=$(3) 
    451449  endef 
    452450 
     
    473471    TITLE:=LuCI - Lua Configuration Interface 
    474472    URL:=http://luci.subsignal.org/ 
    475     SUBMENU:=Themes 
     473    SUBMENU:=4. Themes 
    476474    TITLE:=$(if $(2),$(2),LuCI $(1) theme) 
    477475    MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>) 
     
    491489endef 
    492490 
    493 $(eval $(call theme,base,Common base for all themes,,+luci-lib-web)) 
     491$(eval $(call theme,base,Common base for all themes)) 
    494492$(eval $(call theme,openwrt,OpenWrt.org (default),,,1)) 
    495493$(eval $(call theme,fledermaus,Fledermaus Theme)) 
     
    515513    URL:=http://luci.subsignal.org/ 
    516514    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org> 
    517     SUBMENU:=Translations 
     515    SUBMENU:=5. Translations 
    518516    TITLE:=$(if $(2),$(2),$(1)) 
    519517  endef 
     
    557555    URL:=http://luci.subsignal.org/ 
    558556    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org> 
    559     SUBMENU:=Collections 
     557    SUBMENU:=1. Collections 
    560558    TITLE:=$(if $(2),$(2),LuCI $(if $(1),$(1),general) collection) 
    561559    $(if $(3),DEPENDS:=$(3)) 
     
    570568 
    571569$(eval $(call collection,,\ 
    572     Standard OpenWrt set including full and mini admin and the standard theme,\ 
     570    Standard OpenWrt set including full admin with ppp support and the \ 
     571    default OpenWrt theme,\ 
    573572    +uhttpd +luci-mod-admin-full +luci-theme-openwrt +luci-app-firewall \ 
    574     +libiwinfo)) 
     573    +luci-proto-core +luci-proto-ppp +libiwinfo)) 
    575574 
    576575$(eval $(call collection,ssl,\ 
    577576    Standard OpenWrt set with HTTPS support,\ 
    578     +uhttpd +uhttpd-mod-tls +px5g +luci-mod-admin-full +luci-theme-openwrt \ 
    579     +luci-app-firewall +libiwinfo)) 
     577    +luci +uhttpd-mod-tls +px5g)) 
    580578 
    581579$(eval $(call collection,light,\ 
  • luci/trunk/contrib/package/meshwizard/Makefile

    r7522 r7771  
    1414  SECTION:=luci 
    1515  CATEGORY:=LuCI 
    16   SUBMENU:=Freifunk 
     16  SUBMENU:=9. Freifunk 
    1717  TITLE:=Shell script based wizard for Mesh networks 
    1818  DEPENDS:=+firewall 
  • luci/trunk/contrib/package/remote-update/Makefile

    r5572 r7771  
    1717  SECTION:=luci 
    1818  CATEGORY:=LuCI 
    19   SUBMENU:=Freifunk 
     19  SUBMENU:=9. Freifunk 
    2020  TITLE:=Freifunk remote update utility. 
    2121  DEPENDS:=@TARGET_atheros||@TARGET_ar71xx||@TARGET_brcm_2_4