* Fixed OpenWRT Makefile
* Added missing postinst file
This commit is contained in:
parent
4e53d007bf
commit
e9ae878ce6
2 changed files with 48 additions and 21 deletions
|
@ -18,6 +18,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
||||||
|
|
||||||
# LUA_TARGET:=compile LUAC=$(BUILD_DIR_HOST)/lua/luac
|
# LUA_TARGET:=compile LUAC=$(BUILD_DIR_HOST)/lua/luac
|
||||||
LUA_TARGET:=source
|
LUA_TARGET:=source
|
||||||
|
PKG_SELECTED_MODULES:=
|
||||||
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
@ -25,10 +26,9 @@ include $(INCLUDE_DIR)/package.mk
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/luci/compiletpl
|
|
||||||
ifneq ($(CONFIG_PACKAGE_$(1)),)
|
define Build/Compile
|
||||||
$(MAKE) -C$(PKG_BUILD_DIR)/$(2) build LUA_TARGET=$(LUA_TARGET)
|
for i in '$(PKG_SELECTED_MODULES)'; do $(MAKE) -C$(PKG_BUILD_DIR)/$$i build LUA_TARGET=$(LUA_TARGET); done
|
||||||
endif
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
### Templates ###
|
### Templates ###
|
||||||
|
@ -272,27 +272,50 @@ define Package/luci-sgi-webuci/install
|
||||||
$(call Package/luci/install/template,$(1),libs/sgi-webuci)
|
$(call Package/luci/install/template,$(1),libs/sgi-webuci)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
### Compile Templates ###
|
||||||
|
ifneq ($(CONFIG_PACKAGE_luci-core),)
|
||||||
|
PKG_SELECTED_MODULES+=libs/core
|
||||||
|
endif
|
||||||
|
ifneq ($(CONFIG_PACKAGE_luci-cbi),)
|
||||||
|
PKG_SELECTED_MODULES+=libs/cbi
|
||||||
|
endif
|
||||||
|
ifneq ($(CONFIG_PACKAGE_luci-web),)
|
||||||
|
PKG_SELECTED_MODULES+=libs/web
|
||||||
|
endif
|
||||||
|
|
||||||
define Build/Compile
|
ifneq ($(CONFIG_PACKAGE_luci-ff-halle),)
|
||||||
$(call Package/luci/compiletpl,luci-core,libs/core)
|
PKG_SELECTED_MODULES+=applications/community-halle
|
||||||
$(call Package/luci/compiletpl,luci-cbi,libs/cbi)
|
endif
|
||||||
$(call Package/luci/compiletpl,luci-web,libs/web)
|
ifneq ($(CONFIG_PACKAGE_luci-ff-leipzig),)
|
||||||
|
PKG_SELECTED_MODULES+=applications/community-leipzig
|
||||||
|
endif
|
||||||
|
ifneq ($(CONFIG_PACKAGE_luci-ff-hannover),)
|
||||||
|
PKG_SELECTED_MODULES+=applications/community-hannover
|
||||||
|
endif
|
||||||
|
|
||||||
$(call Package/luci/compiletpl,luci-ff-halle,applications/community-halle)
|
ifneq ($(CONFIG_PACKAGE_luci-mod-admin-core),)
|
||||||
$(call Package/luci/compiletpl,luci-ff-leipzig,applications/community-leipzig)
|
PKG_SELECTED_MODULES+=modules/admin-core
|
||||||
$(call Package/luci/compiletpl,luci-ff-hannover,applications/community-hannover)
|
endif
|
||||||
|
ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk),)
|
||||||
|
PKG_SELECTED_MODULES+=modules/freifunk
|
||||||
|
endif
|
||||||
|
|
||||||
$(call Package/luci/compiletpl,luci-mod-admin-core,modules/admin-core)
|
ifneq ($(CONFIG_PACKAGE_luci-app-ffwizard-leipzig),)
|
||||||
$(call Package/luci/compiletpl,luci-mod-freifunk,modules/freifunk)
|
PKG_SELECTED_MODULES+=applications/luci-ffwizard-leipzig
|
||||||
|
endif
|
||||||
|
ifneq ($(CONFIG_PACKAGE_luci-app-splash),)
|
||||||
|
PKG_SELECTED_MODULES+=applications/luci-splash
|
||||||
|
endif
|
||||||
|
ifneq ($(CONFIG_PACKAGE_luci-app-statistics),)
|
||||||
|
PKG_SELECTED_MODULES+=applications/luci-statistics
|
||||||
|
endif
|
||||||
|
|
||||||
$(call Package/luci/compiletpl,luci-app-ffwizard-leipzig,applications/luci-ffwizard-leipzig)
|
ifneq ($(CONFIG_PACKAGE_luci-sgi-haserl),)
|
||||||
$(call Package/luci/compiletpl,luci-app-firewall,applications/luci-fw)
|
PKG_SELECTED_MODULES+=libs/sgi-haserl
|
||||||
$(call Package/luci/compiletpl,luci-app-splash,applications/luci-splash)
|
endif
|
||||||
$(call Package/luci/compiletpl,luci-app-statistics,applications/luci-statistics)
|
ifneq ($(CONFIG_PACKAGE_luci-sgi-webuci),)
|
||||||
|
PKG_SELECTED_MODULES+=libs/sgi-webuci
|
||||||
$(call Package/luci/compiletpl,luci-sgi-haserl,libs/sgi-haserl)
|
endif
|
||||||
$(call Package/luci/compiletpl,luci-sgi-webuci,libs/sgi-webuci)
|
|
||||||
endef
|
|
||||||
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,luci-core))
|
$(eval $(call BuildPackage,luci-core))
|
||||||
|
|
4
contrib/package/luci/ipkg/luci-ff-halle.postinst
Executable file
4
contrib/package/luci/ipkg/luci-ff-halle.postinst
Executable file
|
@ -0,0 +1,4 @@
|
||||||
|
#!/bin/sh
|
||||||
|
[ -n "${IPKG_INSTROOT}" ] || {
|
||||||
|
( . /etc/uci-defaults/luci-community-halle ) && rm -f /etc/uci-defaults/luci-community-halle
|
||||||
|
}
|
Loading…
Reference in a new issue