From: José Bollo <jose.bollo@iot.bzh>
Date: Tue, 8 Aug 2017 13:35:32 +0000 (+0200)
Subject: afm-unit.conf: refactor LD_LIBRARY_PATH value
X-Git-Tag: 4.99.1~12
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=commitdiff_plain;h=ad8b7c3ad94dd464175e26080e4152bff408d6da

afm-unit.conf: refactor LD_LIBRARY_PATH value

Changes from

  LD_LIBRARY_PATH=$ORIGIN/$LIB

to

  LD_LIBRARY_PATH=$ORIGIN/lib

because $LIB isn't univoque for integrators
while lib is.

Change-Id: Ic4b2f8bb1410c35f75eb957a0ebc10141f995aba
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

diff --git a/conf/afm-unit-debug.conf.in b/conf/afm-unit-debug.conf.in
index 2bc2959..6fbd229 100644
--- a/conf/afm-unit-debug.conf.in
+++ b/conf/afm-unit-debug.conf.in
@@ -146,6 +146,8 @@ EnvironmentFile=-/var/run/afm-debug/{{idaver}}{{^#target=main}}@{{:#target}}{{/#
 %systemd-unit service afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
 {{/required-permission.urn:AGL:permission::public:hidden}}\
 
+Environment=LD_LIBRARY_PATH=$ORIGIN/lib
+
 
 ;---------------------------------------------------------------------------------
 ;----   text/html  application/vnd.agl.native  application/vnd.agl.service    ----
@@ -226,8 +228,6 @@ ExecStart=/usr/bin/afb-daemon \
 ;---------------------------------------------------------------------------------
 {{#content.type=application/x-executable}}
 
-Environment=LD_LIBRARY_PATH=$ORIGIN/$LIB
-
 ExecStart={{:#metadata.install-dir}}/{{content.src}}
 
 {{/content.type=application/x-executable}}
diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index e6163e2..bcd9949 100644
--- a/conf/afm-unit.conf.in
+++ b/conf/afm-unit.conf.in
@@ -142,6 +142,8 @@ Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
 %systemd-unit service afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
 {{/required-permission.urn:AGL:permission::public:hidden}}\
 
+Environment=LD_LIBRARY_PATH=$ORIGIN/lib
+
 
 ;---------------------------------------------------------------------------------
 ;----   text/html  application/vnd.agl.native  application/vnd.agl.service    ----
@@ -222,8 +224,6 @@ ExecStart=/usr/bin/afb-daemon \
 ;---------------------------------------------------------------------------------
 {{#content.type=application/x-executable}}
 
-Environment=LD_LIBRARY_PATH=$ORIGIN/$LIB
-
 ExecStart={{:#metadata.install-dir}}/{{content.src}}
 
 {{/content.type=application/x-executable}}