aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2017-01-31 20:52:23 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-02-16 12:45:14 +0000
commit5679bb5985dfbb5b952ce954f3cd552f2b1aab8d (patch)
tree9d6f0be438e20f17c9e1531a00cad86d1c21e09e
parent50d06c5bd1d141a1549aafe9cdaceeeb75889e46 (diff)
Fix weston fails to start when mapview-demo enabled
Some part of weston which support mapview-demo refers library in /usr/local/lib. To solve this, make symblic link directory into /usr/lib because adding /usr/local/lib into library search path in anyway didn't work well. E.g. Environment=LD_LIBRARY_PATH=/usr/local/lib in weston service E.g. LD_LIBRARY_PATH=/usr/local/lib in /etc/environment E.g. Adding /usr/local/lib into /etc/ld.so.conf Change-Id: I9d85732c18d1c9b13343304f45b53cfc806ec941 Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
-rwxr-xr-xrecipes-demo-hmi/navigation/mapviewer-demo/switch_off_mapviewer-demo.sh4
-rwxr-xr-xrecipes-demo-hmi/navigation/mapviewer-demo/switch_on_mapviewer-demo.sh3
2 files changed, 7 insertions, 0 deletions
diff --git a/recipes-demo-hmi/navigation/mapviewer-demo/switch_off_mapviewer-demo.sh b/recipes-demo-hmi/navigation/mapviewer-demo/switch_off_mapviewer-demo.sh
index 22fa16c7c..b38cbc473 100755
--- a/recipes-demo-hmi/navigation/mapviewer-demo/switch_off_mapviewer-demo.sh
+++ b/recipes-demo-hmi/navigation/mapviewer-demo/switch_off_mapviewer-demo.sh
@@ -3,3 +3,7 @@
/bin/systemctl disable weston-mapviewer-demo.service
/bin/systemctl enable weston.service
/bin/systemctl disable mapviewer.service
+
+rm -f /usr/lib/libmmngrbuf.so.1
+
+sync
diff --git a/recipes-demo-hmi/navigation/mapviewer-demo/switch_on_mapviewer-demo.sh b/recipes-demo-hmi/navigation/mapviewer-demo/switch_on_mapviewer-demo.sh
index f61cdc700..2259a482b 100755
--- a/recipes-demo-hmi/navigation/mapviewer-demo/switch_on_mapviewer-demo.sh
+++ b/recipes-demo-hmi/navigation/mapviewer-demo/switch_on_mapviewer-demo.sh
@@ -4,3 +4,6 @@
/bin/systemctl enable weston-mapviewer-demo.service
/bin/systemctl enable mapviewer.service
+/bin/ln -sf /usr/local/lib/libmmngrbuf.so.1 /usr/lib
+
+sync