| Message ID | 20170506202610.19962-1-yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Sat, 6 May 2017 22:26:10 +0200, Yann E. MORIN wrote: > 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@gmail.com > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Yegor Yefremov <yegorslists@googlemail.com> > --- > package/libubox/libubox.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> 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 > As for libuci, just pass the runtime LUAPATH. > Fixes #9856 > Reported-by: linhuikui@gmail.com > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Yegor Yefremov <yegorslists@googlemail.com> Committed to 2017.02.x, thanks.
diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index 5e2efad0e8..d3e3b709dc 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -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
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@gmail.com Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Yegor Yefremov <yegorslists@googlemail.com> --- package/libubox/libubox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)