Fix the path to the directory for the libraries

Fix the path to the directory of the libraries,
'/usr/agl/lib' to follow the standard, '/usr/lib'
and add subsystem name 'basesystem' for agl-basesystem.

Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: I353cfe3017967ae25348ce10460e453a96d6424e

diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk
index fa1e8d5..cde65cc 100644 (file)
--- a/agl-basefiles/share/agl.mk
+++ b/agl-basefiles/share/agl.mk
@@ -203,7 +203,7 @@ AGLCPPFLAGS += -DAGL_PosixBasedOS001LEGACY_USED -DAGL_STUB -DLINUX
 AGLCPPFLAGS += -I$(SYSROOT)/usr/include/basesystem
 
 ## for agl library##
-AGLLDFLAGS += -L$(SYSROOT)/usr/agl/lib
+AGLLDFLAGS += -L$(SYSROOT)/usr/lib/basesystem
 
 ifneq ($(INST_SHLIBS),libagl_stub)
 AGLLDLIBS += -Wl,-Bdynamic -lpthread
@@ -215,7 +215,7 @@ endif
 COMPONENT_NAME ?= $(error COMPONENT_NAME is not defined)
 AGL_TOPDIR ?= $(DESTDIR)/usr
 AGL_INCDIR := $(AGL_TOPDIR)/include/basesystem
-AGL_LIBDIR := $(AGL_TOPDIR)/lib
+AGL_LIBDIR := $(AGL_TOPDIR)/lib/basesystem
 AGL_BINDIR := $(AGL_TOPDIR)/bin
 AGL_PIXMAPDIR := $(AGL_TOPDIR)/pixmaps
 AGL_UCODEDIR := $(AGL_TOPDIR)/data/ucode
@@ -331,7 +331,7 @@ endif
 
 #################################################################################
 
-RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/agl/lib
+RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/lib/basesystem
 
 #################################################################################
 SUBDIRS := $(filter-out mock,$(SUBDIRS))

diff --git a/agl-systemd/env.txt b/agl-systemd/env.txt
index 48b83df..d8ee4eb 100755 (executable)
--- a/agl-systemd/env.txt
+++ b/agl-systemd/env.txt
@@ -7,7 +7,7 @@ TERM="xterm"
 INIT_UID="1000"
 INIT_GID="1000"
 AGL_RWDATA_PATH="/nv"
-LD_LIBRARY_PATH="/lib:/usr/lib:/usr/agl/lib:/usr/debug/lib"
+LD_LIBRARY_PATH="/lib:/usr/lib:/usr/lib/basesystem:/usr/debug/lib"
 ARB_OPT="FORCE_REBOOT"
 PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/agl/bin:/usr/debug/bin:/usr/debug/sbin:/usr/debug/usr/bin:/usr/debug/usr/sbin"
 PWD="/dev/mqueue"

diff --git a/hal/boot_hal/Makefile b/hal/boot_hal/Makefile
index a5b09fb..d5af569 100755 (executable)
--- a/hal/boot_hal/Makefile
+++ b/hal/boot_hal/Makefile
@@ -29,7 +29,7 @@ CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsolu
 CXXFLAGS += -Wall -fPIC
 
 ######### link options ##########################
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined

diff --git a/hal/can_hal/src/Makefile b/hal/can_hal/src/Makefile
index f34eb75..03cdcab 100755 (executable)
--- a/hal/can_hal/src/Makefile
+++ b/hal/can_hal/src/Makefile
@@ -38,9 +38,9 @@ LDFLAGS += -shared
 LDFLAGS += -Wl,--gc-sections
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
-RPATH := /usr/lib:/usr/agl/lib
+RPATH := /usr/lib:/usr/lib/basesystem
 
 ######### linked library ########################
 LDLIBS += -Wl,-Bdynamic -lstdc++

diff --git a/hal/clock_hal/Makefile b/hal/clock_hal/Makefile
index cec7813..a98cb3c 100755 (executable)
--- a/hal/clock_hal/Makefile
+++ b/hal/clock_hal/Makefile
@@ -33,7 +33,7 @@ CXXFLAGS += -DAGL_REFHW
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
 RPATH :=
 

diff --git a/hal/deck_hal/Makefile b/hal/deck_hal/Makefile
index 340571a..0d66a46 100755 (executable)
--- a/hal/deck_hal/Makefile
+++ b/hal/deck_hal/Makefile
@@ -32,7 +32,7 @@ CXXFLAGS +=  -Wall -fPIC
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
 RPATH := /usr/lib
 

diff --git a/hal/input_hal/Makefile b/hal/input_hal/Makefile
index bfa5c2c..d03b12d 100755 (executable)
--- a/hal/input_hal/Makefile
+++ b/hal/input_hal/Makefile
@@ -36,7 +36,7 @@ CXXFLAGS += -D_USE_DRM
 LDFLAGS := -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
 ######### linked library ########################
 LIBS := -Wl,-Bdynamic -lstdc++

diff --git a/hal/nv_hal/Makefile b/hal/nv_hal/Makefile
index a6c2ee8..7109505 100755 (executable)
--- a/hal/nv_hal/Makefile
+++ b/hal/nv_hal/Makefile
@@ -29,7 +29,7 @@ CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsolu
 CXXFLAGS += -Wall -fPIC
 
 ######### link options ##########################
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined

diff --git a/hal/positioning_hal/Makefile b/hal/positioning_hal/Makefile
index d0d0a69..5e90c7a 100755 (executable)
--- a/hal/positioning_hal/Makefile
+++ b/hal/positioning_hal/Makefile
@@ -37,7 +37,7 @@ CXXFLAGS += -DLINUX -D__CWORD71__VEHICLE_ -D__CWORD71_
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
 RPATH := /usr/lib
 

diff --git a/hal/power_hal/Makefile b/hal/power_hal/Makefile
index ba5f3ab..f717d70 100755 (executable)
--- a/hal/power_hal/Makefile
+++ b/hal/power_hal/Makefile
@@ -31,9 +31,9 @@ CXXFLAGS += -Wall -fPIC
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
-RPATH := /usr/agl/lib
+RPATH := /usr/lib/basesystem
 
 ######### linked library ########################
 LIBS += -Wl,-Bdynamic -lstdc++

diff --git a/hal/security_hal/Makefile b/hal/security_hal/Makefile
index 7658c0f..75a1ff0 100755 (executable)
--- a/hal/security_hal/Makefile
+++ b/hal/security_hal/Makefile
@@ -32,7 +32,7 @@ CXXFLAGS +=  -Wall -fPIC
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
 RPATH :=
 

diff --git a/hal/soc_temperature_hal/Makefile b/hal/soc_temperature_hal/Makefile
index 62ce12d..12b2fa5 100755 (executable)
--- a/hal/soc_temperature_hal/Makefile
+++ b/hal/soc_temperature_hal/Makefile
@@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
 RPATH :=
 

diff --git a/hal/usb_hal/Makefile b/hal/usb_hal/Makefile
index be2b796..c1f8338 100755 (executable)
--- a/hal/usb_hal/Makefile
+++ b/hal/usb_hal/Makefile
@@ -32,7 +32,7 @@ CXXFLAGS +=  -Wall -fPIC
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
 RPATH :=
 

diff --git a/hal/vehicle_hal/Makefile b/hal/vehicle_hal/Makefile
index 2bed2e2..8bf8a66 100755 (executable)
--- a/hal/vehicle_hal/Makefile
+++ b/hal/vehicle_hal/Makefile
@@ -32,7 +32,7 @@ CXXFLAGS +=  -Wall -fPIC
 LDFLAGS += -shared
 LDFLAGS += -Wl,--no-as-needed
 LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib
+LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem
 
 RPATH := /usr/lib