Skip to contentSkip to conversation

libuci: correct lua path

PATCH New Neha Bairathi 3 participants 3 messages Feb 9, 2016 – Feb 23, 2016

lore
Share & tools
lore

Neha Bairathi

author
#0 lore raw

PATCH 1/1 libuci: correct lua path

LUAPATH is used as the path for installing lua binding. As buildroot specifies the install prefix, STAGING_DIR gets appended to TARGET_DIR which is incorrect path for installation, so use relative path.

Reviewed-by Abhimanyu Vishwakarma <[email protected]>
Reviewed-by Marcin Nowakowski <[email protected]>
Signed-off-by Neha Bairathi <[email protected]>
---
 package/libuci/libuci.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libuci/libuci.mk +1 -1
index a78048d..8c060d5 100644
@@ -13,7 +13,7 @@ LIBUCI_DEPENDENCIES = libubox
 ifeq ($(BR2_PACKAGE_LUA_5_1),y)
 LIBUCI_DEPENDENCIES += lua
 LIBUCI_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
 LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF
Signature · 1 line
2.6.2
#1 lore raw

PATCH 1/1 libuci: correct lua path

Quoted 8 lines · Neha Bairathi

LUAPATH is used as the path for installing lua binding. As buildroot specifies the install prefix, STAGING_DIR gets appended to TARGET_DIR which is incorrect path for installation, so use relative path.

Reviewed-by Abhimanyu Vishwakarma <[email protected]>
Reviewed-by Marcin Nowakowski <[email protected]>
Signed-off-by Neha Bairathi <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Checked that it is only used to set the INSTALL command's DESTINATION argument,
and that means that DESTDIR will indeed be prefixed to it.

Regards,
Arnout

Quoted 18 lines
---
 package/libuci/libuci.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libuci/libuci.mk +1 -1
index a78048d..8c060d5 100644
@@ -13,7 +13,7 @@ LIBUCI_DEPENDENCIES = libubox
 ifeq ($(BR2_PACKAGE_LUA_5_1),y)
 LIBUCI_DEPENDENCIES += lua
 LIBUCI_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
 LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Applied
#2 lore raw

PATCH 1/1 libuci: correct lua path

In reply to Neha Bairathi

Dear Neha Bairathi,

Quoted 11 lines · Neha Bairathi

LUAPATH is used as the path for installing lua binding. As buildroot specifies the install prefix, STAGING_DIR gets appended to TARGET_DIR which is incorrect path for installation, so use relative path.

Reviewed-by Abhimanyu Vishwakarma <[email protected]>
Reviewed-by Marcin Nowakowski <[email protected]>
Signed-off-by Neha Bairathi <[email protected]>
---
 package/libuci/libuci.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks. Thanks Arnout for reviewing.

Thomas

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