From e0e671091996fc23db27afe7d02d2c93e5ed0d69 Mon Sep 17 00:00:00 2001
From: nik0 <1867654+nik0@users.noreply.github.com>
Date: Wed, 30 May 2018 22:44:14 +0200
Subject: [PATCH] Fix library path (#392)

* Merge

* Fix LD_LIBRARY_PATH

* Fix LD_LIBRARY_PATH
---
 firmware_mod/controlscripts/rtsp-h264  | 2 +-
 firmware_mod/controlscripts/rtsp-mjpeg | 2 +-
 firmware_mod/run.sh                    | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/firmware_mod/controlscripts/rtsp-h264 b/firmware_mod/controlscripts/rtsp-h264
index 4ecae1f..5ea98bf 100644
--- a/firmware_mod/controlscripts/rtsp-h264
+++ b/firmware_mod/controlscripts/rtsp-h264
@@ -2,7 +2,7 @@
 PIDFILE="/run/v4l2rtspserver-master-h264.pid"
 LOGDIR="/system/sdcard/log"
 LOGPATH="$LOGDIR/v4l2rtspserver-master.log"
-export LD_LIBRARY_PATH='/thirdlib:/system/lib:/system/sdcard/lib/'
+export LD_LIBRARY_PATH='/system/sdcard/lib/:/thirdlib:/system/lib'
 
 if [ ! -f /system/sdcard/config/rtspserver.conf ]; then
   cp /system/sdcard/config/rtspserver.conf.dist /system/sdcard/config/rtspserver.conf
diff --git a/firmware_mod/controlscripts/rtsp-mjpeg b/firmware_mod/controlscripts/rtsp-mjpeg
index c0eb0bd..ab71ee1 100644
--- a/firmware_mod/controlscripts/rtsp-mjpeg
+++ b/firmware_mod/controlscripts/rtsp-mjpeg
@@ -2,7 +2,7 @@
 PIDFILE="/run/v4l2rtspserver-master-mjpeg.pid"
 LOGDIR="/system/sdcard/log"
 LOGPATH="$LOGDIR/v4l2rtspserver-master.log"
-export LD_LIBRARY_PATH='/thirdlib:/system/lib'
+export LD_LIBRARY_PATH='/system/sdcard/lib:/thirdlib:/system/lib'
 
 if [ ! -f /system/sdcard/config/rtspserver.conf ]; then
   cp /system/sdcard/config/rtspserver.conf.dist /system/sdcard/config/rtspserver.conf
diff --git a/firmware_mod/run.sh b/firmware_mod/run.sh
index 742c13f..55319a5 100755
--- a/firmware_mod/run.sh
+++ b/firmware_mod/run.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+export LD_LIBRARY_PATH='/system/sdcard/lib/:/thirdlib:/system/lib'
+
 CONFIGPATH="/system/sdcard/config"
 LOGDIR="/system/sdcard/log"
 LOGPATH="$LOGDIR/startup.log"