projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dependency between luci-admin-full and firewall on user request
[project/luci.git]
/
contrib
/
package
/
luci
/
Makefile
diff --git
a/contrib/package/luci/Makefile
b/contrib/package/luci/Makefile
index
89a8071
..
3274820
100644
(file)
--- a/
contrib/package/luci/Makefile
+++ b/
contrib/package/luci/Makefile
@@
-106,6
+106,11
@@
endef
define Package/luci-core/install
$(call Package/luci/install/template,$(1),libs/core)
define Package/luci-core/install
$(call Package/luci/install/template,$(1),libs/core)
+ $(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \
+ "OpenWrt Firmware" \
+ "$(OPENWRTVERSION)" \
+ "$(PKG_BRANCH)" \
+ "$(PKG_VERSION)"
endef
define Package/luci-core/config
endef
define Package/luci-core/config
@@
-211,6
+216,7
@@
define Package/luci-web
$(call Package/luci/libtemplate)
DEPENDS+=+luci-http +luci-sys +luci-uci +luci-sgi-cgi
TITLE:=MVC Webframework
$(call Package/luci/libtemplate)
DEPENDS+=+luci-http +luci-sys +luci-uci +luci-sgi-cgi
TITLE:=MVC Webframework
+ $(call Config,luci.main.lang,string,en,Default Language)
endef
define Package/luci-web/conffiles
endef
define Package/luci-web/conffiles
@@
-283,6
+289,7
@@
endef
define Package/luci-admin-core/install
$(call Package/luci/install/template,$(1),modules/admin-core)
define Package/luci-admin-core/install
$(call Package/luci/install/template,$(1),modules/admin-core)
+ touch $(1)/etc/init.d/luci_fixtime || true
endef
endef
@@
-299,7
+306,7
@@
endef
define Package/luci-admin-full
$(call Package/luci/webtemplate)
define Package/luci-admin-full
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-admin-core +luci-ipkg
+PACKAGE_luci-admin-full:iptables +PACAKAGE_luci-admin-full:firewall +luci-app-firewall
+ DEPENDS+=+luci-admin-core +luci-ipkg
TITLE:=LuCI Administration - full-featured for full control
endef
TITLE:=LuCI Administration - full-featured for full control
endef
@@
-321,7
+328,7
@@
endef
define Package/luci-mod-freifunk
$(call Package/luci/fftemplate)
define Package/luci-mod-freifunk
$(call Package/luci/fftemplate)
- DEPENDS:=+luci-admin-full
+ DEPENDS:=+luci-admin-full
+luci-json
TITLE:=LuCI Freifunk module
endef
TITLE:=LuCI Freifunk module
endef
@@
-552,7
+559,7
@@
endef
define Package/luci-app-asterisk
$(call Package/luci/webtemplate)
TITLE:=LuCI Support for Asterisk PBX
define Package/luci-app-asterisk
$(call Package/luci/webtemplate)
TITLE:=LuCI Support for Asterisk PBX
- DEPENDS+=@BROKEN +luci-admin-core +PACKAGE_luci-app-asterisk:asterisk14
+ DEPENDS+=@BROKEN +luci-admin-core +PACKAGE_luci-app-asterisk:asterisk14
-xip-core
endef
define Package/luci-app-asterisk/install
endef
define Package/luci-app-asterisk/install
@@
-632,7
+639,7
@@
define Package/luci-theme-fledermaus/install
endef
define Package/luci-theme-freifunk
endef
define Package/luci-theme-freifunk
- $(call Package/luci/
th
template)
+ $(call Package/luci/
ff
template)
DEPENDS:=+luci-web
MAINTAINER:=Stefan Pirwitz <stefan-at-freifunk-bno-dot-de>
TITLE:=alternative Freifunk Theme
DEPENDS:=+luci-web
MAINTAINER:=Stefan Pirwitz <stefan-at-freifunk-bno-dot-de>
TITLE:=alternative Freifunk Theme
@@
-643,7
+650,7
@@
define Package/luci-theme-freifunk/install
endef
define Package/luci-theme-freifunk-bno
endef
define Package/luci-theme-freifunk-bno
- $(call Package/luci/
th
template)
+ $(call Package/luci/
ff
template)
DEPENDS:=+luci-web
MAINTAINER:=Stefan Pirwitz <stefan-at-freifunk-bno-dot-de>
TITLE:=Freifunk Berlin Nordost Theme
DEPENDS:=+luci-web
MAINTAINER:=Stefan Pirwitz <stefan-at-freifunk-bno-dot-de>
TITLE:=Freifunk Berlin Nordost Theme