openwrt-mirror/packages
1
0 Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-10-12 05:57:04 +04:00
Code Issues Packages Projects Releases Wiki Activity

lua-eco: align module installation with Lua 5.4 search paths

Browse Source 
Commit 3fe92e63f5 ("lua: look for lua5.4 modules under /usr instead of
/usr/local") changed LUA_ROOT to /usr/, moving the default Lua 5.4
module search paths out of /usr/local. lua-eco still installed its Lua
and native modules under /usr/local/lib/lua/5.4, so require() could no
longer find them with the default search paths.

Install modules from the main package and all subpackages under
/usr/lib/lua/5.4, which is searched for both .lua and .so files.
Define LUA_INSTALL_DIR once and use it throughout the install rules so
future directory changes only need one update. Bump PKG_RELEASE to 2
so the corrected packages are offered as upgrades.

Fixes: 3fe92e63f5 ("lua: look for lua5.4 modules under /usr instead of /usr/local")
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
This commit is contained in:
Jianhui Zhao authored and Alexandru Ardelean committed 2026-10-05 12:01:29 +03:00
1 parent 349c2ca5c8
commit afb69d99c7
1 file changed
+62 -60
Download Patch File Download Diff File Expand all files Collapse all files
lang/lua/lua-eco/Makefile
+62 -60
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lua-eco
PKG_VERSION:=4.1.4
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL=https://github.com/zhaojh329/lua-eco/releases/download/v$(PKG_VERSION)
@@ -114,136 +114,138 @@ ifneq ($(CONFIG_PACKAGE_lua-eco-ssl),)
endif
endif
LUA_INSTALL_DIR:=/usr/lib/lua/5.4
define Package/lua-eco/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/local/lib/lua/5.4/eco/internal \
$(1)/usr/local/lib/lua/5.4/eco/encoding
$(INSTALL_DIR) $(1)/usr/bin $(1)$(LUA_INSTALL_DIR)/eco/internal \
$(1)$(LUA_INSTALL_DIR)/eco/encoding
$(INSTALL_BIN) $(PKG_BUILD_DIR)/eco $(1)/usr/bin
$(INSTALL_DATA) $(PKG_BUILD_DIR)/hex.lua $(1)/usr/local/lib/lua/5.4/eco/encoding
$(INSTALL_BIN) $(PKG_BUILD_DIR)/{time,sys,file,sync}.so $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/{time,sys,file,sync,channel}.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/hex.lua $(1)$(LUA_INSTALL_DIR)/eco/encoding
$(INSTALL_BIN) $(PKG_BUILD_DIR)/{time,sys,file,sync}.so $(1)$(LUA_INSTALL_DIR)/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/{time,sys,file,sync,channel}.lua $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-cli/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/cli.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/cli.lua $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-log/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/log.so $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/log.so $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-base64/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/encoding
$(INSTALL_BIN) $(PKG_BUILD_DIR)/base64.so $(1)/usr/local/lib/lua/5.4/eco/encoding
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/encoding
$(INSTALL_BIN) $(PKG_BUILD_DIR)/base64.so $(1)$(LUA_INSTALL_DIR)/eco/encoding
endef
define Package/lua-eco-sha1/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/hash
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hash/sha1.so $(1)/usr/local/lib/lua/5.4/eco/hash
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/hash
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hash/sha1.so $(1)$(LUA_INSTALL_DIR)/eco/hash
endef
define Package/lua-eco-sha256/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/hash
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hash/sha256.so $(1)/usr/local/lib/lua/5.4/eco/hash
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/hash
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hash/sha256.so $(1)$(LUA_INSTALL_DIR)/eco/hash
endef
define Package/lua-eco-md5/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/hash
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hash/md5.so $(1)/usr/local/lib/lua/5.4/eco/hash
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/hash
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hash/md5.so $(1)$(LUA_INSTALL_DIR)/eco/hash
endef
define Package/lua-eco-hmac/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/hash
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hash/hmac.lua $(1)/usr/local/lib/lua/5.4/eco/hash
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/hash
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hash/hmac.lua $(1)$(LUA_INSTALL_DIR)/eco/hash
endef
define Package/lua-eco-socket/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/socket.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/socket.so $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/socket.lua $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/socket.so $(1)$(LUA_INSTALL_DIR)/eco/internal
endef
define Package/lua-eco-dns/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/dns.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dns.so $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/dns.lua $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dns.so $(1)$(LUA_INSTALL_DIR)/eco/internal
endef
define Package/lua-eco-ssl/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ssl.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssl.so $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ssl.lua $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssl.so $(1)$(LUA_INSTALL_DIR)/eco/internal
endef
define Package/lua-eco-ubus/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ubus.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ubus.so $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ubus.lua $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ubus.so $(1)$(LUA_INSTALL_DIR)/eco/internal
endef
define Package/lua-eco-http/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/http
$(INSTALL_DATA) $(PKG_BUILD_DIR)/http/*.lua $(1)/usr/local/lib/lua/5.4/eco/http
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/http
$(INSTALL_DATA) $(PKG_BUILD_DIR)/http/*.lua $(1)$(LUA_INSTALL_DIR)/eco/http
endef
define Package/lua-eco-mqtt/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/mqtt.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/mqtt.lua $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-websocket/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/websocket.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/websocket.lua $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-termios/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/termios.so $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/termios.so $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-netlink/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/nl/{nl,genl}.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nl/{nl,genl}.so $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nl/rtnl.so $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/nl/{nl,genl}.lua $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nl/{nl,genl}.so $(1)$(LUA_INSTALL_DIR)/eco/internal
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nl/rtnl.so $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-ip/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/nl/ip.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/nl/ip.lua $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-nl80211/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/nl/nl80211.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nl/nl80211.so $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/nl/nl80211.lua $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nl/nl80211.so $(1)$(LUA_INSTALL_DIR)/eco/internal
endef
define Package/lua-eco-ssh/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ssh.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssh.so $(1)/usr/local/lib/lua/5.4/eco/internal
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco/internal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ssh.lua $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssh.so $(1)$(LUA_INSTALL_DIR)/eco/internal
endef
define Package/lua-eco-packet/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/packet.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/packet.lua $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-uci/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/uci.so $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/uci.so $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-shared/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/shared.so $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_BIN) $(PKG_BUILD_DIR)/shared.so $(1)$(LUA_INSTALL_DIR)/eco
endef
define Package/lua-eco-net/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/net.lua $(1)/usr/local/lib/lua/5.4/eco
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)/eco
$(INSTALL_DATA) $(PKG_BUILD_DIR)/net.lua $(1)$(LUA_INSTALL_DIR)/eco
endef
$(eval $(call BuildPackage,lua-eco))