X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=932a170531d70aca0e4a2a319ecde5fae27f7033;hp=2e7e7a567b32da8e5587d49bdb75cb4d2c03ffe2;hb=205a1b311168b633ca314dfcbb02d3a73b75be8b;hpb=f8771c17dca6e9a357581595ade7dae0dc543cb9 diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 2e7e7a567..932a17053 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -26,10 +26,14 @@ endif 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 +54,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 +98,7 @@ endef define Package/luci-core $(call Package/luci/libtemplate) - DEPENDS:=+lua + DEPENDS:=+lua +luci-nixio TITLE:=LuCI core libraries endef @@ -127,9 +125,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 @@ -234,7 +229,7 @@ endef define Package/luci-lucid $(call Package/luci/libtemplate) TITLE:=LuCId Superserver - DEPENDS+=+luci-nixio +luci-http + DEPENDS+=+luci-nixio +luci-http +luci-px5g endef define Package/luci-lucid/install @@ -248,8 +243,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 @@ -263,8 +258,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" @@ -276,6 +273,22 @@ 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) @@ -315,20 +328,6 @@ 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 @@ -402,7 +401,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 @@ -452,7 +451,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 @@ -474,7 +474,10 @@ endef define Package/luci-app-splash $(call Package/luci/fftemplate) - DEPENDS+=+PACKAGE_luci-app-splash:luci-nixio +PACKAGE_luci-app-splash:iptables-mod-nat-extra + 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 @@ -664,6 +667,17 @@ 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 ### @@ -883,6 +897,9 @@ 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 @@ -896,10 +913,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 @@ -986,6 +999,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),) @@ -994,9 +1010,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 @@ -1056,7 +1069,7 @@ 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" @@ -1071,13 +1084,12 @@ $(eval $(call BuildPackage,luci-json)) $(eval $(call BuildPackage,luci-luanet)) $(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)) @@ -1108,6 +1120,7 @@ $(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))