Skip to contentSkip to conversation

package/libubox: fix lua module install path

PATCH New Yann E. MORIN 3 participants 3 messages May 6, 2017 – May 15, 2017

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 package/libubox: fix lua module install path

The LUAPATH variable is only used when installing the lua module, and cmake knows very well how to do out-of-tree isntalls, so there is no reason to include the staging path in LUAPATH, which will cause our post-install sanity checks to kick in and whine:

libubox: installs files in /home/lhk/workspace/orangepi/host/usr/a rm-buildroot-linux-gnueabihf/sysroot//home/lhk/workspace/orangepi

As for libuci, just pass the runtime LUAPATH.

Fixes #9856

Reported-by linhuikui at gmail.com
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/libubox/libubox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libubox/libubox.mk +1 -1
index 5e2efad0e8..d3e3b709dc 100644
@@ -13,7 +13,7 @@ LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c)
 ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy)
 LIBUBOX_DEPENDENCIES += lua
 LIBUBOX_CONF_OPTS += -DBUILD_LUA=ON \
-	-DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
+	-DLUAPATH=/usr/lib/lua/5.1 \
 	-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
 else
 LIBUBOX_CONF_OPTS += -DBUILD_LUA=OFF
Signature · 1 line
2.11.0
Applied
#1 lore raw

PATCH 1/1 package/libubox: fix lua module install path

Hello,

Quoted 10 lines · Yann E. MORIN

The LUAPATH variable is only used when installing the lua module, and cmake knows very well how to do out-of-tree isntalls, so there is no reason to include the staging path in LUAPATH, which will cause our post-install sanity checks to kick in and whine:

libubox: installs files in /home/lhk/workspace/orangepi/host/usr/a rm-buildroot-linux-gnueabihf/sysroot//home/lhk/workspace/orangepi

As for libuci, just pass the runtime LUAPATH.

Quoted 8 lines

Fixes #9856

Reported-by linhuikui at gmail.com
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/libubox/libubox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 package/libubox: fix lua module install path

In reply to Yann E. MORIN
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

The LUAPATH variable is only used when installing the lua module, and cmake knows very well how to do out-of-tree isntalls, so there is no reason to include the staging path in LUAPATH, which will cause our post-install sanity checks to kick in and whine:

libubox: installs files in /home/lhk/workspace/orangepi/host/usr/a rm-buildroot-linux-gnueabihf/sysroot//home/lhk/workspace/orangepi

Quoted 7 lines

As for libuci, just pass the runtime LUAPATH.

Fixes #9856

Reported-by linhuikui at gmail.com
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Yegor Yefremov <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard