[usbtunerhelper] fix line breask issue.

diff --git a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
index 23de067..79d16cd 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
+++ b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 PV = "1.0+git${SRCPV}"
-PR = "r9"
+PR = "r10"
 SRC_REV = ""
 
 SRC_URI = " \

diff --git a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/fix_delayed_loading.patch b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/fix_delayed_loading.patch
index d03bc6a..8ddda43 100755 (executable)
--- a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/fix_delayed_loading.patch
+++ b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/fix_delayed_loading.patch
@@ -1,34 +1,34 @@
-diff -Naur git.orig/usbtunerhelper.c git/usbtunerhelper.c\r
---- git.orig/usbtunerhelper.c  2015-11-04 20:03:46.000000000 +0100\r
-+++ git/usbtunerhelper.c       2015-11-04 20:04:16.200476304 +0100\r
-@@ -665,6 +665,7 @@\r
-       int debug = 0;\r
-       int scan_inverval = 1;\r
-       int scan_count = 60;\r
-+      char filename[] = "/tmp/.vtuner_available";\r
- \r
-       int option;\r
-       while ((option = getopt(argc, argv, "dh")) >= 0)\r
-@@ -680,6 +681,12 @@\r
-               }\r
-       }\r
- \r
-+      if ( (scan_adapters() > 0) && (!debug) ){\r
-+              FILE *fp;\r
-+              fp=fopen(filename, "w+");\r
-+              fclose(fp);\r
-+      }\r
-+\r
-       if (!debug) daemon_init();\r
- \r
-       signal(SIGTERM, sigint_handler);\r
-@@ -700,6 +707,9 @@\r
- \r
-       available_vtuner = get_avail_vtuner();\r
- \r
-+      int ret;\r
-+      ret = remove(filename);\r
-+      \r
-       for (i = 0; i < adaptercount; i++)\r
-       {\r
-               init_adapter(i);\r
+diff -Naur git.orig/usbtunerhelper.c git/usbtunerhelper.c
+--- git.orig/usbtunerhelper.c  2015-11-04 20:03:46.000000000 +0100
++++ git/usbtunerhelper.c       2015-11-04 20:04:16.200476304 +0100
+@@ -665,6 +665,7 @@
+       int debug = 0;
+       int scan_inverval = 1;
+       int scan_count = 60;
++      char filename[] = "/tmp/.vtuner_available";
+ 
+       int option;
+       while ((option = getopt(argc, argv, "dh")) >= 0)
+@@ -680,6 +681,12 @@
+               }
+       }
+ 
++      if ( (scan_adapters() > 0) && (!debug) ){
++              FILE *fp;
++              fp=fopen(filename, "w+");
++              fclose(fp);
++      }
++
+       if (!debug) daemon_init();
+ 
+       signal(SIGTERM, sigint_handler);
+@@ -700,6 +707,9 @@
+ 
+       available_vtuner = get_avail_vtuner();
+ 
++      int ret;
++      ret = remove(filename);
++      
+       for (i = 0; i < adaptercount; i++)
+       {
+               init_adapter(i);

diff --git a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/usbtunerhelper.sh b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/usbtunerhelper.sh
index 3d3e620..8c4be0d 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/usbtunerhelper.sh
+++ b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/usbtunerhelper.sh
@@ -1,34 +1,34 @@
-#!/bin/sh\r
-\r
-if ! [ -x /usr/bin/usbtunerhelper ]; then\r
-       exit 0\r
-fi\r
-\r
-VTUNER_FILE="/tmp/.vtuner_available"\r
-\r
-case "$1" in\r
-       start)\r
-               start-stop-daemon -S -x /usr/bin/usbtunerhelper\r
-               if [ -f $VTUNER_FILE ]\r
-               then\r
-                       echo "[USBTUNERHELPER] wait for initializing vtuner"\r
-                       while [ ! -f $VTUNER_FILE ]; do\r
-                               usleep 100000\r
-                       done\r
-                       sleep 2\r
-               fi\r
-               ;;\r
-       stop)\r
-               start-stop-daemon -K -x /usr/bin/usbtunerhelper\r
-               ;;\r
-       restart|reload)\r
-               $0 stop\r
-               $0 start\r
-               ;;\r
-       *)\r
-               echo "Usage: $0 {start|stop|restart}"\r
-               exit 1\r
-               ;;\r
-esac\r
-\r
-exit 0\r
+#!/bin/sh
+
+if ! [ -x /usr/bin/usbtunerhelper ]; then
+       exit 0
+fi
+
+VTUNER_FILE="/tmp/.vtuner_available"
+
+case "$1" in
+       start)
+               start-stop-daemon -S -x /usr/bin/usbtunerhelper
+               if [ -f $VTUNER_FILE ]
+               then
+                       echo "[USBTUNERHELPER] wait for initializing vtuner"
+                       while [ ! -f $VTUNER_FILE ]; do
+                               usleep 100000
+                       done
+                       sleep 2
+               fi
+               ;;
+       stop)
+               start-stop-daemon -K -x /usr/bin/usbtunerhelper
+               ;;
+       restart|reload)
+               $0 stop
+               $0 start
+               ;;
+       *)
+               echo "Usage: $0 {start|stop|restart}"
+               exit 1
+               ;;
+esac
+
+exit 0