X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=268048f4578233b62816e78fb50e2f5347bfb22c;hp=b438760f5ac78c7de777b9f081220870980e5bad;hb=5c419acf926b7332976c6a5c1586d2badf9664ae;hpb=004213483340028437736f5810bd1c2274b7b72c diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index b438760f5a..268048f457 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -1,27 +1,49 @@ 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.6+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.7+svn +else + PKG_SOURCE_URL:=https://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.7+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 +PKG_BUILD_DEPENDS:=libnotimpl LUA_TARGET:=source PKG_SELECTED_MODULES:= include $(INCLUDE_DIR)/package.mk +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/Configure endef @@ -39,10 +61,16 @@ endef define Package/luci/fftemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI - Freifunk Support + 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 @@ -62,7 +90,8 @@ 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 @@ -94,7 +123,7 @@ define Package/luci-core/config endef ifneq ($(CONFIG_PACKAGE_luci-core_compile),) - LUA_TARGET:=compile + LUA_TARGET:=compile endif @@ -131,9 +160,19 @@ define Package/luci-fastindex/install 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-web $(call Package/luci/libtemplate) - DEPENDS+=+luci-addons +luci-uci + DEPENDS+=+luci-http +luci-addons +luci-uci +luci-sgi-cgi TITLE:=MVC Webframework endef @@ -147,12 +186,26 @@ 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/fftemplate) DEPENDS+= \ - +luci-sgi-haserl +luci-app-splash +luci-app-olsr \ + +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ +luci-app-ffwizard-leipzig \ +luci-theme-fledermaus \ +luci-i18n-german \ @@ -163,14 +216,13 @@ endef define Package/luci-ff-halle/install $(call Package/luci/install/template,$(1),applications/community-halle) - $(CP) -a ./ipkg/luci-ff-halle.postinst $(1)/CONTROL/postinst endef define Package/luci-ff-leipzig $(call Package/luci/fftemplate) DEPENDS+= \ - +luci-sgi-haserl +luci-app-splash +luci-app-olsr \ + +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ +luci-app-ffwizard-leipzig \ +luci-theme-fledermaus \ +luci-i18n-german \ @@ -181,14 +233,13 @@ 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 endef define Package/luci-ff-hannover $(call Package/luci/fftemplate) DEPENDS+= \ - +luci-sgi-haserl +luci-app-splash +luci-app-olsr \ + +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ +luci-theme-fledermaus \ +luci-i18n-german \ +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice @@ -199,16 +250,43 @@ 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 endef +define Package/luci-ff-berlin + $(call Package/luci/fftemplate) + DEPENDS+= \ + +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ + +luci-theme-fledermaus \ + +luci-i18n-german \ + +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice + TITLE:=Freifunk Berlin Community Meta-Package +endef + +define Package/luci-ff-berlin/install + $(call Package/luci/install/template,$(1),applications/community-berlin) +endef + +define Package/luci-ff-augsburg + $(call Package/luci/fftemplate) + DEPENDS+= \ + +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ + +luci-theme-fledermaus \ + +luci-i18n-german \ + +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice + TITLE:=Freifunk Augsburg Community Meta-Package +endef + +define Package/luci-ff-augsburg/install + $(call Package/luci/install/template,$(1),applications/community-augsburg) +endef + ### Modules ### define Package/luci-mod-admin-core $(call Package/luci/webtemplate) DEPENDS+=+luci-web +luci-cbi +luci-theme-openwrt +luci-i18n-english - TITLE:=Administration module + TITLE:=Administration core module endef define Package/luci-mod-admin-core/install @@ -216,9 +294,31 @@ define Package/luci-mod-admin-core/install endef +define Package/luci-mod-admin-mini + $(call Package/luci/webtemplate) + DEPENDS+=+luci-mod-admin-core + TITLE:=Simplified Administration module (INCOMPLETE) +endef + +define Package/luci-mod-admin-mini/install + $(call Package/luci/install/template,$(1),modules/admin-mini) +endef + + +define Package/luci-mod-admin-full + $(call Package/luci/webtemplate) + DEPENDS+=+luci-mod-admin-core + TITLE:=Full featured Administration module +endef + +define Package/luci-mod-admin-full/install + $(call Package/luci/install/template,$(1),modules/admin-full) +endef + + define Package/luci-mod-freifunk $(call Package/luci/fftemplate) - DEPENDS:=+luci-mod-admin-core + DEPENDS:=+luci-mod-admin-full TITLE:=LuCI Freifunk module endef @@ -257,13 +357,12 @@ 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-mod-admin-core +olsrd-mod-txtinfo + DEPENDS+=+luci-mod-admin-full +olsrd-mod-txtinfo TITLE:=OLSR configuration and status module endef @@ -285,7 +384,7 @@ endef define Package/luci-app-splash $(call Package/luci/fftemplate) - DEPENDS+=+luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt + DEPENDS+=+luasocket +iptables-mod-nat +iptables-mod-ipopt TITLE:=Freifunk DHCP-Splash application endef @@ -295,17 +394,12 @@ 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/webtemplate) - DEPENDS+=+luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1 + DEPENDS+=+luci-mod-admin-full +collectd +collectd-mod-rrdtool1 +rrdtool1 TITLE:=LuCI Statistics Application endef @@ -315,29 +409,65 @@ 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 - $(CP) -a ./ipkg/luci-statistics.postinst $(1)/CONTROL/postinst +endef + + +define Package/luci-app-upnp + $(call Package/luci/webtemplate) + DEPENDS+=+luci-mod-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-mod-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-mod-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 ### Server Gateway Interfaces ### -define Package/luci-sgi-haserl +define Package/luci-sgi-cgi $(call Package/luci/libtemplate) - DEPENDS+=+luci-web +haserl-lua - TITLE:=SGI for Haserl + TITLE:=SGI for CGI +endef + +define Package/luci-sgi-cgi/install + $(call Package/luci/install/template,$(1),libs/sgi-cgi) endef -define Package/luci-sgi-haserl/install - $(call Package/luci/install/template,$(1),libs/sgi-haserl) - $(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst +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/libtemplate) - DEPENDS+=+luci-web TITLE:=SGI for Webuci endef @@ -378,7 +508,7 @@ endef define Package/luci-i18n-english $(call Package/luci/i18ntemplate) - TITLE:=English (incomplete) + TITLE:=English endef define Package/luci-i18n-english/install @@ -386,6 +516,17 @@ define Package/luci-i18n-english/install endef +define Package/luci-i18n-french + $(call Package/luci/i18ntemplate) + TITLE:=French +endef + +define Package/luci-i18n-french/install + $(call Package/luci/install/template,$(1),i18n/french) +endef + + + ### Compile ### ifneq ($(CONFIG_PACKAGE_luci-core),) @@ -397,6 +538,9 @@ 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-uci),) PKG_SELECTED_MODULES+=libs/uci endif @@ -404,6 +548,10 @@ ifneq ($(CONFIG_PACKAGE_luci-web),) PKG_SELECTED_MODULES+=libs/web endif +ifneq ($(CONFIG_PACKAGE_luci-httpd),) + PKG_SELECTED_MODULES+=libs/httpd +endif + ifneq ($(CONFIG_PACKAGE_luci-ff-halle),) PKG_SELECTED_MODULES+=applications/community-halle endif @@ -413,10 +561,22 @@ endif ifneq ($(CONFIG_PACKAGE_luci-ff-hannover),) PKG_SELECTED_MODULES+=applications/community-hannover endif +ifneq ($(CONFIG_PACKAGE_luci-ff-berlin),) + PKG_SELECTED_MODULES+=applications/community-berlin +endif +ifneq ($(CONFIG_PACKAGE_luci-ff-augsburg),) + PKG_SELECTED_MODULES+=applications/community-augsburg +endif ifneq ($(CONFIG_PACKAGE_luci-mod-admin-core),) PKG_SELECTED_MODULES+=modules/admin-core endif +ifneq ($(CONFIG_PACKAGE_luci-mod-admin-mini),) + PKG_SELECTED_MODULES+=modules/admin-mini +endif +ifneq ($(CONFIG_PACKAGE_luci-mod-admin-full),) + PKG_SELECTED_MODULES+=modules/admin-full +endif ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk),) PKG_SELECTED_MODULES+=modules/freifunk endif @@ -439,9 +599,21 @@ 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-sgi-haserl),) - PKG_SELECTED_MODULES+=libs/sgi-haserl +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 @@ -460,22 +632,38 @@ 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 -MAKE_FLAGS += MODULES="$(PKG_SELECTED_MODULES)" LUA_TARGET="$(LUA_TARGET)" CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" LDFLAGS="$(TARGET_LDFLAGS)" +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-uci)) $(eval $(call BuildPackage,luci-web)) +$(eval $(call BuildPackage,luci-httpd)) + $(eval $(call BuildPackage,luci-ff-halle)) $(eval $(call BuildPackage,luci-ff-leipzig)) $(eval $(call BuildPackage,luci-ff-hannover)) +$(eval $(call BuildPackage,luci-ff-berlin)) +$(eval $(call BuildPackage,luci-ff-augsburg)) $(eval $(call BuildPackage,luci-mod-admin-core)) +$(eval $(call BuildPackage,luci-mod-admin-mini)) +$(eval $(call BuildPackage,luci-mod-admin-full)) $(eval $(call BuildPackage,luci-mod-freifunk)) $(eval $(call BuildPackage,luci-app-ffwizard-leipzig)) @@ -484,8 +672,12 @@ $(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-upnp)) +$(eval $(call BuildPackage,luci-app-ntpc)) +$(eval $(call BuildPackage,luci-app-ddns)) -$(eval $(call BuildPackage,luci-sgi-haserl)) +$(eval $(call BuildPackage,luci-sgi-cgi)) +$(eval $(call BuildPackage,luci-sgi-luci)) $(eval $(call BuildPackage,luci-sgi-webuci)) $(eval $(call BuildPackage,luci-theme-fledermaus)) @@ -493,3 +685,4 @@ $(eval $(call BuildPackage,luci-theme-openwrt)) $(eval $(call BuildPackage,luci-i18n-german)) $(eval $(call BuildPackage,luci-i18n-english)) +$(eval $(call BuildPackage,luci-i18n-french))