X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=82c3ecfff12e66168e218c9efe83279b492d20f6;hp=5fd6f4cc3d5fa06c53b6c3783ff8194ca5619368;hb=ee4fd290a0c4c4ef2ebdbe82e4c3c972016ded16;hpb=7a3715c5c576c5b64884bca7802f9ddd04c4fe72 diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 5fd6f4cc3..82c3ecfff 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -23,13 +23,18 @@ else PKG_SOURCE_VERSION:=$(PKG_REV) endif +PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -PKG_BUILD_DEPENDS:=libnotimpl LUA_TARGET:=source +LUCI_CFLAGS:= PKG_SELECTED_MODULES:= +ifeq ($(BOARD),brcm-2.4) + MAKE_FLAGS += CRAP="1" +endif + include $(INCLUDE_DIR)/package.mk @@ -50,42 +55,36 @@ endef ### Templates ### define Package/luci/libtemplate - SECTION:=admin - CATEGORY:=Administration + SECTION:=luci + CATEGORY:=LuCI TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.freifunk-halle.net/ MAINTAINER:=Steven Barth - SUBMENU:=LuCI Libraries + SUBMENU:=Libraries DEPENDS:=+luci-core endef define Package/luci/fftemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Freifunk Support + SUBMENU:=Freifunk DEPENDS:=+luci-mod-freifunk endef -define Package/luci/httpdtemplate - $(call Package/luci/libtemplate) - SUBMENU:=LuCIttpd - DEPENDS:=+luci-httpd -endef - define Package/luci/i18ntemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Translations + SUBMENU:=Translations DEPENDS:=+luci-web endef define Package/luci/thtemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Themes + SUBMENU:=Themes DEPENDS:=+luci-web endef define Package/luci/webtemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Components + SUBMENU:=Components endef @@ -100,7 +99,7 @@ endef define Package/luci-core $(call Package/luci/libtemplate) - DEPENDS:=+lua + DEPENDS:=+lua +luci-nixio TITLE:=LuCI core libraries endef @@ -127,9 +126,6 @@ define Package/luci-core/config config PACKAGE_luci-core_source bool "Full Source" - config PACKAGE_luci-core_zipped - bool "Precompiled and compressed" - endchoice endef @@ -220,6 +216,16 @@ define Package/luci-json/install endef +define Package/luci-lmo + $(call Package/luci/libtemplate) + TITLE:=lmo +endef + +define Package/luci-lmo/install + $(call Package/luci/install/template,$(1),libs/lmo) +endef + + define Package/luci-luanet $(call Package/luci/libtemplate) TITLE:=luanet @@ -227,7 +233,29 @@ define Package/luci-luanet endef define Package/luci-luanet/install - $(call Package/luci/install/template,$(1),libs/luanet) + $(call Package/luci/install/template,$(1),libs/luanet) +endef + + +define Package/luci-iwinfo + $(call Package/luci/libtemplate) + TITLE:=Wireless abstration library +endef + +define Package/luci-iwinfo/install + $(call Package/luci/install/template,$(1),libs/iwinfo) +endef + + +define Package/luci-lucid + $(call Package/luci/libtemplate) + TITLE:=LuCId Superserver + DEPENDS+=+luci-nixio +luci-http +luci-px5g +endef + +define Package/luci-lucid/install + $(call Package/luci/install/template,$(1),libs/lucid) + $(call Package/luci/install/template,$(1),libs/lucid-http) endef @@ -236,8 +264,8 @@ NIXIO_TLS:=axtls define Package/luci-nixio $(call Package/luci/libtemplate) - TITLE:=NIXIO Socket Library - DEPENDS:= + TITLE:=NIXIO POSIX Library + DEPENDS:=+PACKAGE_luci-nixio_openssl:libopenssl +PACKAGE_luci-nixio_cyassl:libcyassl-luci endef define Package/luci-nixio/install @@ -251,8 +279,10 @@ define Package/luci-nixio/config config PACKAGE_luci-nixio_axtls bool "Builtin (axTLS)" - select PACKAGE_dropbear - select PACKAGE_dropbearconvert + + config PACKAGE_luci-nixio_cyassl + bool "CyaSSL" + select PACKAGE_libcyassl-luci config PACKAGE_luci-nixio_openssl bool "OpenSSL" @@ -264,10 +294,27 @@ ifneq ($(CONFIG_PACKAGE_luci-nixio_openssl),) NIXIO_TLS:=openssl endif +ifneq ($(CONFIG_PACKAGE_luci-nixio_cyassl),) + NIXIO_TLS:=cyassl + LUCI_CFLAGS+=-I$(STAGING_DIR)/usr/include/cyassl +endif + + +define Package/luci-px5g + $(call Package/luci/libtemplate) + TITLE:=PX5G RSA Keymaster + DEPENDS:=+luci-nixio +endef + +define Package/luci-px5g/install + $(call Package/luci/install/template,$(1),libs/px5g) +endef + define Package/luci-sys $(call Package/luci/libtemplate) TITLE:=LuCI Linux/POSIX system library + DEPENDS:=+luci-iwinfo endef define Package/luci-sys/install @@ -277,7 +324,7 @@ endef define Package/luci-web $(call Package/luci/libtemplate) - DEPENDS+=+luci-http +luci-sys +luci-uci +luci-sgi-cgi + DEPENDS+=+luci-http +luci-sys +luci-uci +luci-lucid +luci-sgi-cgi +luci-lmo TITLE:=MVC Webframework $(call Config,luci.main.lang,string,en,Default Language) endef @@ -303,32 +350,18 @@ endef -### HTTPD ### - -define Package/luci-httpd - $(call Package/luci/httpdtemplate) - DEPENDS:=+luci-http +libuci - TITLE:=Server Core -endef - -define Package/luci-httpd/install - $(call Package/luci/install/template,$(1),libs/lucittpd) -endef - - - ### Community Packages ### define Package/luci-freifunk-community $(call Package/luci/fftemplate) DEPENDS+= \ - +luci-sgi-cgi +luci-app-splash \ + +luci-lucid +luci-sgi-cgi +luci-app-splash \ +luci-app-ffwizard-leipzig \ +luci-i18n-german \ +PACKAGE_luci-freifunk-community:olsrd-luci +PACKAGE_luci-freifunk-community:olsrd-luci-mod-dyn-gw-plain \ +PACKAGE_luci-freifunk-community:olsrd-luci-mod-txtinfo +PACKAGE_luci-freifunk-community:olsrd-luci-mod-nameservice \ +PACKAGE_luci-freifunk-community:olsrd-luci-mod-watchdog +PACKAGE_luci-freifunk-community:kmod-tun \ - +PACKAGE_luci-freifunk-community:ip +luci-app-olsr + +PACKAGE_luci-freifunk-community:ip +PACKAGE_luci-freifunk-community:freifunk-watchdog +luci-app-olsr TITLE:=Freifunk Community Meta-Package endef @@ -390,7 +423,7 @@ endef define Package/luci-mod-freifunk $(call Package/luci/fftemplate) - DEPENDS:=+luci-admin-full +luci-json + DEPENDS:=+luci-admin-full +luci-json +PACKAGE_luci-mod-freifunk:freifunk-firewall TITLE:=LuCI Freifunk module endef @@ -440,7 +473,8 @@ endef define Package/luci-app-olsr $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +PACKAGE_luci-app-olsr:olsrd-luci +PACKAGE_luci-app-olsr:olsrd-luci-mod-txtinfo + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-olsr:olsrd-luci \ + +PACKAGE_luci-app-olsr:olsrd-luci-mod-txtinfo TITLE:=OLSR configuration and status module endef @@ -462,7 +496,10 @@ endef define Package/luci-app-splash $(call Package/luci/fftemplate) - DEPENDS+=+PACKAGE_luci-app-splash:luasocket + DEPENDS+=+PACKAGE_luci-app-splash:luci-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 TITLE:=Freifunk DHCP-Splash application endef @@ -494,6 +531,56 @@ define Package/luci-app-statistics/install $(call Package/luci/install/template,$(1),applications/luci-statistics) endef +define Package/luci-app-diag-core + $(call Package/luci/webtemplate) + DEPENDS+=+PACKAGE_luci-app-diag-core:luci-admin-core + TITLE:=LuCI Diagnostics Tools (Core) +endef + +define Package/luci-app-diag-devinfo + $(call Package/luci/webtemplate) + DEPENDS+=+PACKAGE_luci_app-diag-devinfo:luci-app-diag-core \ + +PACKAGE_luci-app-diag-devinfo:smap \ + +PACKAGE_luci-app-diag-devinfo:netdiscover \ + +PACKAGE_luci-app-diag-devinfo:mac-to-devinfo \ + +PACKAGE_luci-app-diag-devinfo:httping \ + +PACKAGE_luci-app-diag-devinfo:smap-to-devinfo \ + +PACAKGE_luci-app-diag-devinfo:netdiscover-to-devinfo + TITLE:=LuCI Diagnostics Tools (Device Info) +endef + +define Package/luci-app-voice-core + $(call Package/luci/webtemplate) + DEPENDS+=+PACKAGE_luci-app-voice-core:luci-admin-core + TITLE:=LuCI Voice Software (Core) +endef + +define Package/luci-app-voice-diag + $(call Package/luci/webtemplate) + DEPENDS+=+PACKAGE_luci-app-voice-diag:luci-app-voice-core \ + +PACKAGE_luci-apps-voice-diag:luci-app-diag-devinfo + TITLE:=LuCI Voice Software (Diagnostics) +endef + +define Package/luci-app-diag-devinfo/conffiles +/etc/config/luci_devinfo +endef + +define Package/luci-app-diag-core/install + $(call Package/luci/install/template,$(1),applications/luci-diag-core) +endef + +define Package/luci-app-diag-devinfo/install + $(call Package/luci/install/template,$(1),applications/luci-diag-devinfo) +endef + +define Package/luci-app-voice-core/install + $(call Package/luci/install/template,$(1),applications/luci-voice-core) +endef + +define Package/luci-app-voice-diag/install + $(call Package/luci/install/template,$(1),applications/luci-voice-diag) +endef define Package/luci-app-upnp $(call Package/luci/webtemplate) @@ -645,13 +732,24 @@ endef define Package/luci-app-openvpn $(call Package/luci/webtemplate) TITLE:=LuCI Support for OpenVPN - DEPENDS+=@BROKEN +luci-admin-core +PACKAGE_luci-app-openvpn:openvpn + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-openvpn:openvpn endef define Package/luci-app-openvpn/install $(call Package/luci/install/template,$(1),applications/luci-openvpn) endef +define Package/luci-app-p2pblock + $(call Package/luci/webtemplate) + TITLE:=LuCI Support for the Freifunk P2P-Block addon + DEPENDS+=+luci-admin-core +luci-app-firewall \ + +PACKAGE_luci-app-p2pblock:freifunk-p2pblock +endef + +define Package/luci-app-p2pblock/install + $(call Package/luci/install/template,$(1),applications/luci-p2pblock) +endef + ### Server Gateway Interfaces ### @@ -664,25 +762,6 @@ 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 LuCIttpd -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/libtemplate) - TITLE:=SGI for Webuci -endef - -define Package/luci-sgi-webuci/install - $(call Package/luci/install/template,$(1),libs/sgi-webuci) -endef - ### Themes ### define Package/luci-theme-base $(call Package/luci/thtemplate) @@ -726,10 +805,22 @@ define Package/luci-theme-freifunk-bno/install $(call Package/luci/install/template,$(1),themes/freifunk-bno) endef +define Package/luci-theme-freifunk-hannover + $(call Package/luci/fftemplate) + DEPENDS:=+luci-web + MAINTAINER:=Mikolas Bingemer + TITLE:=Freifunk Hannover Theme +endef + +define Package/luci-theme-freifunk-hannover/install + $(call Package/luci/install/template,$(1),themes/freifunk-hannover) +endef + define Package/luci-theme-openwrt $(call Package/luci/thtemplate) TITLE:=OpenWrt.org (default) - DEPENDS:=+luci-theme-base + DEPENDS:=+luci-theme-base luci-core + DEFAULT:=y if PACKAGE_luci-core endef define Package/luci-theme-openwrt/install @@ -827,6 +918,47 @@ define Package/luci-i18n-greek/install $(call Package/luci/install/template,$(1),i18n/greek) endef + +define Package/luci-i18n-catalan + $(call Package/luci/i18ntemplate) + TITLE:=Catalan (by Eduard Duran) +endef + +define Package/luci-i18n-catalan/install + $(call Package/luci/install/template,$(1),i18n/catalan) +endef + + +define Package/luci-i18n-portuguese + $(call Package/luci/i18ntemplate) + TITLE:=Portuguese (by Jose Monteiro) +endef + +define Package/luci-i18n-portuguese/install + $(call Package/luci/install/template,$(1),i18n/portuguese) +endef + + +define Package/luci-i18n-spanish + $(call Package/luci/i18ntemplate) + TITLE:=Spanish (by Guillermo Javier Nardoni) +endef + +define Package/luci-i18n-spanish/install + $(call Package/luci/install/template,$(1),i18n/spanish) +endef + + +define Package/luci-i18n-vietnamese + $(call Package/luci/i18ntemplate) + TITLE:=Vietnamese (by Hong Phuc Dang) +endef + +define Package/luci-i18n-vietnamese/install + $(call Package/luci/install/template,$(1),i18n/vietnamese) +endef + + ### Compile ### ifneq ($(CONFIG_PACKAGE_luci-core),) PKG_SELECTED_MODULES+=libs/core @@ -849,12 +981,24 @@ endif ifneq ($(CONFIG_PACKAGE_luci-json),) PKG_SELECTED_MODULES+=libs/json endif +ifneq ($(CONFIG_PACKAGE_luci-lmo),) + PKG_SELECTED_MODULES+=libs/lmo +endif ifneq ($(CONFIG_PACKAGE_luci-luanet),) PKG_SELECTED_MODULES+=libs/luanet endif +ifneq ($(CONFIG_PACKAGE_luci-iwinfo),) + PKG_SELECTED_MODULES+=libs/iwinfo +endif +ifneq ($(CONFIG_PACKAGE_luci-lucid),) + PKG_SELECTED_MODULES+=libs/lucid libs/lucid-http +endif ifneq ($(CONFIG_PACKAGE_luci-nixio),) PKG_SELECTED_MODULES+=libs/nixio endif +ifneq ($(CONFIG_PACKAGE_luci-px5g),) + PKG_SELECTED_MODULES+=libs/px5g +endif ifneq ($(CONFIG_PACKAGE_luci-uci),) PKG_SELECTED_MODULES+=libs/uci endif @@ -868,10 +1012,6 @@ ifneq ($(CONFIG_PACKAGE_luci-uvl),) PKG_SELECTED_MODULES+=libs/uvl endif -ifneq ($(CONFIG_PACKAGE_luci-httpd),) - PKG_SELECTED_MODULES+=libs/lucittpd -endif - ifneq ($(CONFIG_PACKAGE_luci-admin-core),) PKG_SELECTED_MODULES+=modules/admin-core endif @@ -913,6 +1053,18 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-statistics),) PKG_SELECTED_MODULES+=applications/luci-statistics endif +ifneq ($(CONFIG_PACKAGE_luci-app-voice-core),) + PKG_SELECTED_MODULES+=applications/luci-voice-core +endif +ifneq ($(CONFIG_PACKAGE_luci-app-voice-diag),) + PKG_SELECTED_MODULES+=applications/luci-voice-diag +endif +ifneq ($(CONFIG_PACKAGE_luci-app-diag-core),) + PKG_SELECTED_MODULES+=applications/luci-diag-core +endif +ifneq ($(CONFIG_PACKAGE_luci-app-diag-devinfo),) + PKG_SELECTED_MODULES+=applications/luci-diag-devinfo +endif ifneq ($(CONFIG_PACKAGE_luci-app-upnp),) PKG_SELECTED_MODULES+=applications/luci-upnp endif @@ -958,6 +1110,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-openvpn),) PKG_SELECTED_MODULES+=applications/luci-openvpn endif +ifneq ($(CONFIG_PACKAGE_luci-app-p2pblock),) + PKG_SELECTED_MODULES+=applications/luci-p2pblock +endif ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),) @@ -966,9 +1121,6 @@ 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-base),) PKG_SELECTED_MODULES+=themes/base @@ -979,6 +1131,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-theme-freifunk-bno),) PKG_SELECTED_MODULES+=themes/freifunk-bno endif +ifneq ($(CONFIG_PACKAGE_luci-theme-freifunk-hannover),) + PKG_SELECTED_MODULES+=themes/freifunk-hannover +endif ifneq ($(CONFIG_PACKAGE_luci-theme-freifunk),) PKG_SELECTED_MODULES+=themes/freifunk endif @@ -1013,13 +1168,25 @@ endif ifneq ($(CONFIG_PACKAGE_luci-i18n-greek),) PKG_SELECTED_MODULES+=i18n/greek endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-catalan),) + PKG_SELECTED_MODULES+=i18n/catalan +endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-portuguese),) + PKG_SELECTED_MODULES+=i18n/portuguese +endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-spanish),) + PKG_SELECTED_MODULES+=i18n/spanish +endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-vietnamese),) + PKG_SELECTED_MODULES+=i18n/vietnamese +endif MAKE_FLAGS += \ MODULES="$(PKG_SELECTED_MODULES)" \ LUA_TARGET="$(LUA_TARGET)" \ LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ + CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" @@ -1031,15 +1198,17 @@ $(eval $(call BuildPackage,luci-http)) $(eval $(call BuildPackage,luci-httpclient)) $(eval $(call BuildPackage,luci-ipkg)) $(eval $(call BuildPackage,luci-json)) +$(eval $(call BuildPackage,luci-lmo)) $(eval $(call BuildPackage,luci-luanet)) +$(eval $(call BuildPackage,luci-iwinfo)) +$(eval $(call BuildPackage,luci-lucid)) $(eval $(call BuildPackage,luci-nixio)) +$(eval $(call BuildPackage,luci-px5g)) $(eval $(call BuildPackage,luci-uci)) $(eval $(call BuildPackage,luci-sys)) $(eval $(call BuildPackage,luci-web)) $(eval $(call BuildPackage,luci-uvl)) -$(eval $(call BuildPackage,luci-httpd)) - $(eval $(call BuildPackage,luci-admin-core)) $(eval $(call BuildPackage,luci-admin-mini)) $(eval $(call BuildPackage,luci-admin-full)) @@ -1055,6 +1224,10 @@ $(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-app-diag-core)) +$(eval $(call BuildPackage,luci-app-diag-devinfo)) +$(eval $(call BuildPackage,luci-app-voice-core)) +$(eval $(call BuildPackage,luci-app-voice-diag)) $(eval $(call BuildPackage,luci-app-upnp)) $(eval $(call BuildPackage,luci-app-ntpc)) $(eval $(call BuildPackage,luci-app-ddns)) @@ -1070,15 +1243,15 @@ $(eval $(call BuildPackage,luci-app-livestats)) $(eval $(call BuildPackage,luci-app-asterisk)) $(eval $(call BuildPackage,luci-app-polipo)) $(eval $(call BuildPackage,luci-app-openvpn)) +$(eval $(call BuildPackage,luci-app-p2pblock)) $(eval $(call BuildPackage,luci-sgi-cgi)) -$(eval $(call BuildPackage,luci-sgi-luci)) -$(eval $(call BuildPackage,luci-sgi-webuci)) $(eval $(call BuildPackage,luci-theme-base)) $(eval $(call BuildPackage,luci-theme-fledermaus)) $(eval $(call BuildPackage,luci-theme-freifunk)) $(eval $(call BuildPackage,luci-theme-freifunk-bno)) +$(eval $(call BuildPackage,luci-theme-freifunk-hannover)) $(eval $(call BuildPackage,luci-theme-openwrt)) $(eval $(call BuildPackage,luci-theme-openwrtlight)) @@ -1090,3 +1263,7 @@ $(eval $(call BuildPackage,luci-i18n-russian)) $(eval $(call BuildPackage,luci-i18n-portuguese_brazilian)) $(eval $(call BuildPackage,luci-i18n-japanese)) $(eval $(call BuildPackage,luci-i18n-greek)) +$(eval $(call BuildPackage,luci-i18n-catalan)) +$(eval $(call BuildPackage,luci-i18n-portuguese)) +$(eval $(call BuildPackage,luci-i18n-spanish)) +$(eval $(call BuildPackage,luci-i18n-vietnamese))