diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-12-25 18:04:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-25 18:04:28 +0100 |
| commit | 04bb5449373b591f45c1467a4930f96911c97c6b (patch) | |
| tree | d9810d0dd813410c7944096329819c32f495e0e8 | |
| parent | 814ad96df9634f39cb793c31d55b0351f88fadff (diff) | |
| parent | b0d8fff3e40568af633032aacb0624da16f4266c (diff) | |
Merge pull request #3352 from NeoRaider/move-luasrcdiet
luci-base: use luasrcdiet from separate package
| -rw-r--r-- | luci.mk | 2 | ||||
| -rw-r--r-- | modules/luci-base/Makefile | 9 |
2 files changed, 1 insertions, 10 deletions
@@ -86,7 +86,7 @@ PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \ PKG_RELEASE?=1 PKG_INSTALL:=$(if $(realpath src/Makefile),1) -PKG_BUILD_DEPENDS += lua/host luci-base/host LUCI_CSSTIDY:csstidy/host $(LUCI_BUILD_DEPENDS) +PKG_BUILD_DEPENDS += lua/host luci-base/host LUCI_CSSTIDY:csstidy/host LUCI_SRCDIET:luasrcdiet/host $(LUCI_BUILD_DEPENDS) PKG_CONFIG_DEPENDS += CONFIG_LUCI_SRCDIET CONFIG_LUCI_JSMIN CONFIG_LUCI_CSSTIDY PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile index ea23309101..ca7de0bb2f 100644 --- a/modules/luci-base/Makefile +++ b/modules/luci-base/Makefile @@ -14,14 +14,8 @@ LUCI_BASENAME:=base LUCI_TITLE:=LuCI core libraries LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc +liblucihttp-lua +rpcd-mod-file +rpcd-mod-luci +cgi-io - -PKG_SOURCE:=v1.0.0.tar.gz -PKG_SOURCE_URL:=https://github.com/jirutka/luasrcdiet/archive/ -PKG_HASH:=48162e63e77d009f5848f18a5cabffbdfc867d0e5e73c6d407f6af5d6880151b PKG_LICENSE:=MIT -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/luasrcdiet-1.0.0 - include $(INCLUDE_DIR)/host-build.mk define Package/luci-base/conffiles @@ -41,11 +35,8 @@ endef define Host/Install $(INSTALL_DIR) $(1)/bin - $(INSTALL_DIR) $(1)/lib/lua/5.1 $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo $(INSTALL_BIN) src/jsmin $(1)/bin/jsmin - $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/luasrcdiet $(1)/bin/luasrcdiet - $(CP) $(HOST_BUILD_DIR)/luasrcdiet $(1)/lib/lua/5.1/ endef $(eval $(call HostBuild)) |