From 3f87f7ae8341e5f84478facbd3fc62b243ef8732 Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Sat, 3 Oct 2026 19:32:10 +0800 Subject: [PATCH] luaossl: fix Lua 5.4 module installation paths Commit 3fe92e63f558 moved the default Lua 5.4 module search paths from /usr/local to /usr. luaossl still staged and packaged its Lua 5.4 modules under /usr/local/lib/lua/5.4, outside the default search paths. Set lua54path and lua54cpath to /usr/lib/lua/5.4 and update the package install rules to match. Bump PKG_RELEASE to 3 so the corrected package is offered as an upgrade. Keep Lua 5.1 and Lua 5.3 paths unchanged. Fixes: 3fe92e63f558 ("lua: look for lua5.4 modules under /usr instead of /usr/local") Signed-off-by: Jianhui Zhao --- lang/lua/luaossl/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lang/lua/luaossl/Makefile b/lang/lua/luaossl/Makefile index 93f2abb9fd..2b62b29ad2 100644 --- a/lang/lua/luaossl/Makefile +++ b/lang/lua/luaossl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luaossl PKG_VERSION:=20220711 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Siger Yang PKG_MIRROR_HASH:=7abb1070da36906f9ef310af1a12827543bb5de4bbe239068420fd8b3e3858d2 @@ -81,8 +81,8 @@ ifeq ($(BUILD_VARIANT),lua54) MAKE_FLAGS += \ LUA_APIS="5.4" \ LUA54_CPPFLAGS="-I$(STAGING_DIR)/usr/include/lua5.4" \ - lua54cpath="/usr/local/lib/lua/5.4" \ - lua54path="/usr/local/lib/lua/5.4" + lua54cpath="/usr/lib/lua/5.4" \ + lua54path="/usr/lib/lua/5.4" endif define Package/luaossl/install @@ -100,11 +100,11 @@ define Package/luaossl-lua5.3/install $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/openssl $(1)/usr/local/lib/lua/5.3/ endef define Package/luaossl-lua5.4/install - $(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4 - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/_openssl.so $(1)/usr/local/lib/lua/5.4/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/openssl.lua $(1)/usr/local/lib/lua/5.4/ + $(INSTALL_DIR) $(1)/usr/lib/lua/5.4 + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/_openssl.so $(1)/usr/lib/lua/5.4/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/openssl.lua $(1)/usr/lib/lua/5.4/ - $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/openssl $(1)/usr/local/lib/lua/5.4/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/openssl $(1)/usr/lib/lua/5.4/ endef $(eval $(call BuildPackage,luaossl))