projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add temporary dependency for luci-web to luci-sgi-cgi
[project/luci.git]
/
contrib
/
package
/
luci
/
Makefile
diff --git
a/contrib/package/luci/Makefile
b/contrib/package/luci/Makefile
index 2e0a3120093cff3865f0ff7711824edcb07a2fe7..2c0a6f10352068efe2dd76294c4769e0087255ad 100644
(file)
--- a/
contrib/package/luci/Makefile
+++ b/
contrib/package/luci/Makefile
@@
-1,27
+1,49
@@
include $(TOPDIR)/rules.mk
PKG_BRANCH:=trunk
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_NAME:=luci
-PKG_VERSION:=0.5+svn$(PKG_REV)
PKG_RELEASE:=1
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_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
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
define Build/Configure
endef
@@
-43,6
+65,12
@@
define Package/luci/fftemplate
DEPENDS:=+luci-mod-freifunk
endef
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
define Package/luci/i18ntemplate
$(call Package/luci/libtemplate)
SUBMENU:=LuCI - Translations
@@
-62,7
+90,8
@@
endef
define Package/luci/install/template
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
endef
@@
-94,7
+123,7
@@
define Package/luci-core/config
endef
ifneq ($(CONFIG_PACKAGE_luci-core_compile),)
endef
ifneq ($(CONFIG_PACKAGE_luci-core_compile),)
-
LUA_TARGET:=compile
+ LUA_TARGET:=compile
endif
endif
@@
-131,9
+160,19
@@
define Package/luci-fastindex/install
endef
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)
define Package/luci-web
$(call Package/luci/libtemplate)
- DEPENDS+=+luci-
addons +luci-uc
i
+ DEPENDS+=+luci-
http +luci-addons +luci-uci +luci-sgi-cg
i
TITLE:=MVC Webframework
endef
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+= \
### 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 \
+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)
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+= \
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 \
+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)
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+= \
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
+luci-theme-fledermaus \
+luci-i18n-german \
+olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice
@@
-199,7
+250,6
@@
endef
define Package/luci-ff-hannover/install
$(call Package/luci/install/template,$(1),applications/community-hannover)
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
endef
@@
-257,7
+307,6
@@
endef
define Package/luci-app-firewall/install
$(call Package/luci/install/template,$(1),applications/luci-fw)
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
endef
@@
-285,7
+334,7
@@
endef
define Package/luci-app-splash
$(call Package/luci/fftemplate)
define Package/luci-app-splash
$(call Package/luci/fftemplate)
- DEPENDS+=+lu
ci-sgi-haserl
+iptables-mod-nat +iptables-mod-ipopt
+ DEPENDS+=+lu
asocket
+iptables-mod-nat +iptables-mod-ipopt
TITLE:=Freifunk DHCP-Splash application
endef
TITLE:=Freifunk DHCP-Splash application
endef
@@
-295,11
+344,6
@@
endef
define Package/luci-app-splash/install
$(call Package/luci/install/template,$(1),applications/luci-splash)
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
endef
@@
-315,24
+359,30
@@
endef
define Package/luci-app-statistics/install
$(call Package/luci/install/template,$(1),applications/luci-statistics)
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
endef
### Server Gateway Interfaces ###
endef
### Server Gateway Interfaces ###
-define Package/luci-sgi-
haserl
+define Package/luci-sgi-
cgi
$(call Package/luci/libtemplate)
$(call Package/luci/libtemplate)
- DEPENDS+=+luci-web
+haserl-lua
- TITLE:=SGI for
Haserl
+ DEPENDS+=+luci-web
+ TITLE:=SGI for
CGI
endef
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-cgi/install
+ $(call Package/luci/install/template,$(1),libs/sgi-cgi)
endef
endef
+define Package/luci-sgi-luci
+ $(call Package/luci/libtemplate)
+ DEPENDS+=+luci-web +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)
define Package/luci-sgi-webuci
$(call Package/luci/libtemplate)
@@
-377,7
+427,7
@@
endef
define Package/luci-i18n-english
$(call Package/luci/i18ntemplate)
define Package/luci-i18n-english
$(call Package/luci/i18ntemplate)
- TITLE:=English
(incomplete)
+ TITLE:=English
endef
define Package/luci-i18n-english/install
endef
define Package/luci-i18n-english/install
@@
-396,6
+446,9
@@
endif
ifneq ($(CONFIG_PACKAGE_luci-fastindex),)
PKG_SELECTED_MODULES+=libs/fastindex
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
ifneq ($(CONFIG_PACKAGE_luci-uci),)
PKG_SELECTED_MODULES+=libs/uci
endif
@@
-403,6
+456,10
@@
ifneq ($(CONFIG_PACKAGE_luci-web),)
PKG_SELECTED_MODULES+=libs/web
endif
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
ifneq ($(CONFIG_PACKAGE_luci-ff-halle),)
PKG_SELECTED_MODULES+=applications/community-halle
endif
@@
-439,8
+496,11
@@
ifneq ($(CONFIG_PACKAGE_luci-app-statistics),)
PKG_SELECTED_MODULES+=applications/luci-statistics
endif
PKG_SELECTED_MODULES+=applications/luci-statistics
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
endif
ifneq ($(CONFIG_PACKAGE_luci-sgi-webuci),)
PKG_SELECTED_MODULES+=libs/sgi-webuci
@@
-461,15
+521,24
@@
ifneq ($(CONFIG_PACKAGE_luci-i18n-english),)
endif
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-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-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-halle))
$(eval $(call BuildPackage,luci-ff-leipzig))
$(eval $(call BuildPackage,luci-ff-hannover))
@@
-484,7
+553,8
@@
$(eval $(call BuildPackage,luci-app-qos))
$(eval $(call BuildPackage,luci-app-splash))
$(eval $(call BuildPackage,luci-app-statistics))
$(eval $(call BuildPackage,luci-app-splash))
$(eval $(call BuildPackage,luci-app-statistics))
-$(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))
$(eval $(call BuildPackage,luci-sgi-webuci))
$(eval $(call BuildPackage,luci-theme-fledermaus))