Procházet zdrojové kódy

change libcallback loading

Since we now hook and bind our own copy of app_init.sh, we no longer need to copy iCamera to a staging directory to load libcallback
Alfonso Gamboa před 3 roky
rodič
revize
f1fe733db6

+ 2 - 3
SD_ROOT/wz_mini/etc/init.d/wz_post.sh

@@ -87,9 +87,8 @@ if [[ "$RTSP_HI_RES_ENABLED" == "true" ]] ||  [[ "$RTSP_LOW_RES_ENABLED" == "tru
 		        insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/extra/v4l2loopback.ko video_nr=1
 		fi
 	fi
-
-        cp /system/bin/iCamera /opt/wz_mini/tmp/.storage/
-        mount -o ro,bind /opt/wz_mini/usr/bin/iCamera /system/bin/iCamera
+	echo "set path for iCamera"
+	sed -i 's/\/system\/bin\/iCamera/\/opt\/wz_mini\/usr\/bin\/iCamera/g' /opt/wz_mini/tmp/.storage/app_init.sh
 fi
 
 /opt/wz_mini/etc/init.d/wz_user.sh &

+ 1 - 4
SD_ROOT/wz_mini/usr/bin/iCamera

@@ -6,7 +6,4 @@ echo "inject callback library and run"
 
 export LD_LIBRARY_PATH='/thirdlib:/system/lib:/opt/wz_mini/lib'
 
-#libcallback has setunbuf built-in
-#LD_PRELOAD='libcallback.so:libtinyalsa.so.2.0.0:libsetunbuf.so' /opt/wz_mini/tmp/.storage/iCamera
-
-LD_PRELOAD='libcallback.so:libtinyalsa.so.2.0.0' /opt/wz_mini/tmp/.storage/iCamera
+LD_PRELOAD='libcallback.so:libtinyalsa.so.2.0.0' /system/bin/iCamera