From 76ed3f94adc0f731b3c7f7af005c48e6f8ca0eea Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Sat, 3 Oct 2026 19:32:10 +0800 Subject: [PATCH] cqueues: fix Lua 5.4 module installation paths Commit 3fe92e63f558 moved the default Lua 5.4 module search paths from /usr/local to /usr. cqueues 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/cqueues/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lang/lua/cqueues/Makefile b/lang/lua/cqueues/Makefile index 0292a1bce8..fd562c9b33 100644 --- a/lang/lua/cqueues/Makefile +++ b/lang/lua/cqueues/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cqueues PKG_VERSION:=20200726 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Siger Yang PKG_MIRROR_HASH:=214a09c250e92d12cd63cdaedce9491f874a920e8222cc4faf10a978ec7bd1bd @@ -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/cqueues/install @@ -101,11 +101,11 @@ define Package/cqueues-lua5.3/install $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/cqueues $(1)/usr/local/lib/lua/5.3 endef define Package/cqueues-lua5.4/install - $(INSTALL_DIR) $(1)/usr/local/lib/lua/5.4 - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/_cqueues.so $(1)/usr/local/lib/lua/5.4 - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/cqueues.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/_cqueues.so $(1)/usr/lib/lua/5.4 + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/cqueues.lua $(1)/usr/lib/lua/5.4 - $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/cqueues $(1)/usr/local/lib/lua/5.4 + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/cqueues $(1)/usr/lib/lua/5.4 endef $(eval $(call BuildPackage,cqueues))