Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Mainline

Browse Source
This commit is contained in:
CN_SZTL
2020-12-27 00:39:53 +08:00
parent ee155bad4c e696ebab8f
commit b3abb769ea
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/ctcgfw/luci-app-diskman/Makefile
View File

@@ -75,9 +75,9 @@ define Package/$(PKG_NAME)/install
# $(INSTALL_DIR) $(1)/www
# cp -pR $(PKG_BUILD_DIR)/htdoc/* $(1)/www
$(INSTALL_DIR) $(1)/usr/lib/lua/luci
cp -pR $(PKG_BUILD_DIR)/luasrc/* $(1)/usr/lib/lua/luci/
cp -pR $(PKG_BUILD_DIR)/applications/$(PKG_NAME)/luasrc/* $(1)/usr/lib/lua/luci/
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
$$(foreach po,$$(shell find $(PKG_BUILD_DIR)/po/*/*.po), \
$$(foreach po,$$(shell find $(PKG_BUILD_DIR)/applications/$(PKG_NAME)/po/*/*.po), \
po2lmo $$(po) \
$(1)/usr/lib/lua/luci/i18n/diskman.$$(shell echo $$(po) | awk -F'/' '{print $$$$(NF-1)}').lmo;)
#po2lmo $(PKG_BUILD_DIR)/po/zh-cn/diskman.po $(1)/usr/lib/lua/luci/i18n/diskman.zh-cn.lmo

2
package/ctcgfw/luci-lib-docker/Makefile
View File

@@ -23,7 +23,7 @@ define Package/$(PKG_NAME)
SUBMENU:=6. Libraries
TITLE:=Docker Engine API for LuCI
PKGARCH:=all
DEPENDS:=+luci-lib-jsonc
DEPENDS:=@(aarch64||arm||x86_64) @HAS_FPU +luci-lib-jsonc
endef
define Package/$(PKG_NAME)/description

1
package/lean/pdnsd-alt/Makefile
View File

@@ -6,6 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/shadowsocks/pdnsd.git
PKG_MIRROR_HASH:=c4093a2a21cc44228f4fad536c3303e5d263f400b5ca6ec04fe17bb705f5b92e
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=a8e46ccba7b0fa2230d6c42ab6dcd92926f6c21d
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz