From: kos <kos@dev3>
Date: Thu, 17 Jan 2013 08:03:44 +0000 (+0900)
Subject: Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=commitdiff_plain;h=e0a5e46b1f37c907fc584f9a503aa04c53d79594;hp=dcf4bb14cdfa1a51d6313932ff0cc85e6a6c058d

Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
---

diff --git a/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb b/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb
index be6c53d..be53dcd 100755
--- a/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb
@@ -4,7 +4,7 @@ LICENSE = "CLOSED"
 
 KV = "${VUPLUS_KERNEL_VERSION}"
 PV = "${KV}"
-PR = "r19-${SRCDATE}"
+PR = "r20-${SRCDATE}"
 
 PREFERRED_GCC_VERSION = "4.4.3"
 
@@ -29,7 +29,7 @@ do_install() {
 
 pkg_postinst_${PN} () {
         if [ -d /proc/stb ]; then
-                depmod -ae
+                depmod -a
         fi
         true
 }
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/bm750/bootup_3.1 b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/bm750/bootup_3.1
index 2bff27d..5373396 100755
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/bm750/bootup_3.1
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/bm750/bootup_3.1
@@ -7,7 +7,7 @@ else
 	done
 fi
 
-depmod -Ae
+depmod -A
 
 # sleep after 10min
 hdparm -S 120 /dev/sda
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuduo2/bootup_3.1 b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuduo2/bootup_3.1
index d71420a..4775c37 100755
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuduo2/bootup_3.1
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuduo2/bootup_3.1
@@ -7,7 +7,7 @@ else
 	done
 fi
 
-depmod -Ae
+depmod -A
 
 # sleep after 10min
 hdparm -S 120 /dev/sda
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo/bootup_3.1 b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo/bootup_3.1
index 572e96a..5673133 100755
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo/bootup_3.1
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo/bootup_3.1
@@ -7,7 +7,7 @@ else
 	done
 fi
 
-depmod -Ae
+depmod -A
 
 #Solo has only usb port. Needs a delay for usb pvr
 count=1
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo2/bootup_3.1 b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo2/bootup_3.1
index 616627b..e08dc3f 100755
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo2/bootup_3.1
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo2/bootup_3.1
@@ -7,7 +7,7 @@ else
 	done
 fi
 
-depmod -Ae
+depmod -A
 
 # sleep after 10min
 hdparm -S 120 /dev/sda
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuultimo/bootup_3.1 b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuultimo/bootup_3.1
index daf9c63..8b28138 100755
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuultimo/bootup_3.1
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuultimo/bootup_3.1
@@ -7,7 +7,7 @@ else
 	done
 fi
 
-depmod -Ae
+depmod -A
 
 # sleep after 10min
 hdparm -S 120 /dev/sda
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuuno/bootup_3.1 b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuuno/bootup_3.1
index 52819bf..7aa3413 100755
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuuno/bootup_3.1
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vuuno/bootup_3.1
@@ -7,7 +7,7 @@ else
 	done
 fi
 
-depmod -Ae
+depmod -A
 
 # sleep after 10min
 hdparm -S 120 /dev/sda
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
index 4222808..c43def6 100644
--- a/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -1,7 +1,5 @@
-PR .= "-vuplus1"
+PR .= "-vuplus2"
 
-#BOOTUP = "${@base_contains('PREFERRED_VERSION_linux-vuplus', '3.1.1', 'bootup_3.1', ' ', d)}"
-#BOOTUP_vusolo2 = "${@base_contains('PREFERRED_VERSION_linux-vuplus', '3.3.6', 'bootup_3.1', ' ', d)}"
 BOOTUP = "bootup_3.1" 
 
 SRC_URI_append = " \
diff --git a/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index e58e877..ef511b8 100644
--- a/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v3.0/linux-${PV}.tar.bz2"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 S = "${WORKDIR}/linux-${PV}"
 
 set_arch() {
diff --git a/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.31.bb b/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.31.bb
index 0bbc5e7..fa6ac5e 100644
--- a/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.31.bb
+++ b/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.31.bb
@@ -3,7 +3,9 @@ SECTION = "devel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-PR = "r0"
+PR = "r1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS += "unifdef-native"
 RDEPENDS_${PN}-dev = ""
diff --git a/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb b/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
index 90277ae..1874d38 100644
--- a/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
+++ b/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC = "2"
 
 require linux-libc-headers.inc
 
diff --git a/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.3.bb b/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.3.bb
index ea90f4a..cec3b71 100644
--- a/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.3.bb
+++ b/meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.3.bb
@@ -1,4 +1,4 @@
-PRINC = "1"
+PRINC = "2"
 
 require linux-libc-headers.inc
 
diff --git a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb
index d2a1e3f..779678e 100755
--- a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb
+++ b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb
@@ -2,7 +2,7 @@ SUMMARY = "Screen grabber for Set-Top-Boxes"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRCREV = "8394e1ba98c73d7c56d3235ef16cce253dc597cd"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = " \
 	git://schwerkraft.elitedvb.net/aio-grab/aio-grab.git;protocol=git;tag=${SRCREV} \
diff --git a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab/aio-grab_vuplus_8394e1ba98c73d7c56d3235ef16cce253dc597cd.patch b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab/aio-grab_vuplus_8394e1ba98c73d7c56d3235ef16cce253dc597cd.patch
index b7208c6..b984de8 100644
--- a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab/aio-grab_vuplus_8394e1ba98c73d7c56d3235ef16cce253dc597cd.patch
+++ b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab/aio-grab_vuplus_8394e1ba98c73d7c56d3235ef16cce253dc597cd.patch
@@ -8,9 +8,16 @@ index ccfb515..a6f8d11 100644
  stamp-h1
 +aio-grab_vuplus_*
 diff --git a/main.c b/main.c
-index 190ff5f..c611913 100644
+index 190ff5f..dd22bc4 100644
 --- a/main.c
 +++ b/main.c
+@@ -1,5 +1,5 @@
+ /*
+-AiO Dreambox Screengrabber v0.83a
++AiO Screengrabber v0.83a
+ 
+ written 2006 - 2009 by Seddi
+ Contact: seddi@ihad.tv / http://www.ihad.tv
 @@ -38,6 +38,7 @@ Feel free to use the code for your own projects. See LICENSE file for details.
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -44,14 +51,18 @@ index 190ff5f..c611913 100644
  static const char *file_getline(const char *filename)
  {
  	static char *line = NULL;
-@@ -184,7 +199,6 @@ static int file_scanf_lines(const char *filename, const char *fmt, ...)
+@@ -184,10 +199,9 @@ static int file_scanf_lines(const char *filename, const char *fmt, ...)
  }
  
  // main program
 -
  int main(int argc, char **argv) {
  
- 	printf("AiO Dreambox Screengrabber " PACKAGE_VERSION "\n\n");
+-	printf("AiO Dreambox Screengrabber " PACKAGE_VERSION "\n\n");
++	printf("AiO Screengrabber " PACKAGE_VERSION "\n\n");
+ 
+ 	unsigned int xres_v = 0,yres_v = 0,xres_o,yres_o,xres,yres,aspect,width;
+ 	int c,osd_only,video_only,use_osd_res,use_png,use_jpg,jpg_quality,no_aspect,use_letterbox;
 @@ -205,11 +219,29 @@ int main(int argc, char **argv) {
  	char filename[256] = { "/tmp/screenshot.bmp" };
  
diff --git a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
index 7feb064..ad7f42e 100644
--- a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
+++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
@@ -2,9 +2,12 @@ DESCRIPTION = "opera-hbbtv"
 PRIORITY = "required"
 LICENSE = "CLOSED"
 
+DEPENDS = "tslib mpfr gmp"
+RDEPENS = "tslib-conf libts-1.0-0 libsysfs2 libgmp3 libmpfr1"
+
 SRC_DATE = "20121128_1"
 
-PR = "r0_${SRC_DATE}"
+PR = "r1_${SRC_DATE}"
 SRC_URI = "http://code.vuplus.com/download/build.fc3abf29fb03f797e78f907928125638/embedded/opera-sdk-build-package/opera-hbbtv_${SRC_DATE}.tar.gz"
 
 INHIBIT_PACKAGE_STRIP = "1"