Merge branch 'vuplus-1.6k_dev' into vuplus-1.6k

Conflicts:
	recipes/enigma2/enigma2.bb
	recipes/opera-hbbtv/opera-hbbtv_0.1.bb

diff --cc recipes/directfb/directfb.inc
Simple merge

diff --cc recipes/enigma2/enigma2-plugins.bb
index 5e3a835,6d05d5a..33c74eb
--- 1/recipes/enigma2/enigma2-plugins.bb
--- 2/recipes/enigma2/enigma2-plugins.bb
+++ b/recipes/enigma2/enigma2-plugins.bb
@@@ -43,8 -43,9 +43,8 @@@ S = "${WORKDIR}/git
  DEPENDS = "python-pyopenssl python-gdata streamripper python-mutagen python-daap"
  DEPENDS += "enigma2"
  DEPENDS += "enigma2-plugin-extensions-openwebif"
- 
+ DEPENDS += "enigma2-plugin-systemplugins-adsm"
  
 -
  def modify_po():
        import os
        try:

diff --cc recipes/enigma2/enigma2.bb
Simple merge

diff --cc recipes/images/vuplus-image.bb
index ae4977d,af63928..a7180e5
--- 1/recipes/images/vuplus-image.bb
--- 2/recipes/images/vuplus-image.bb
+++ b/recipes/images/vuplus-image.bb
@@@ -75,3 -75,12 +75,9 @@@ do_rootfs_append_vuuno() 
  do_rootfs_append_vuultimo() {
      generate_nfo
  }
 -do_rootfs_append_vu7425() {
 -    generate_nfo
 -}
+ do_rootfs_append_vuduo2() {
+     generate_nfo
+ }
+ do_rootfs_append_vusolo2() {
+     generate_nfo
+ }

diff --cc recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
index 61082eb,eab11d6..bcf01c7
--- 1/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
--- 2/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
@@@ -6,10 -6,19 +6,13 @@@ PR = "r0
  
  DEFAULT_PREFERENCE = "-1"
  
+ DVB_PATCH = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '3.3.6', 'dvbapi-5.5.patch', 'dvbapi-5.3.patch', d)}"
+ 
  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
             file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
-            file://dvbapi-5.3.patch;patch=1;pnum=1 \
+            file://${DVB_PATCH};patch=1;pnum=1 \
          "
 -#SRC_URI_vusolo2 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 -#     file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
 -#     file://dvbapi-5.5.patch;patch=1;pnum=1 \
 -#     "
 -
 -
+ 
  S = "${WORKDIR}/linux-${PV}"
  
  set_arch() {

diff --cc recipes/tuxbox/tuxbox-libtuxtxt.bb
index d9576c4,30c5b92..dd1275e
--- 1/recipes/tuxbox/tuxbox-libtuxtxt.bb
--- 2/recipes/tuxbox/tuxbox-libtuxtxt.bb
+++ b/recipes/tuxbox/tuxbox-libtuxtxt.bb
@@@ -65,6 -65,19 +65,16 @@@ SRC_URI_append_vuultimo = " 
        file://resize_framebuffer.diff;patch=1 \
        file://allow_different_demux.diff;patch=1"
  
 -SRC_URI_append_vu7425 = " \
 -      file://32bpp.diff;patch=1 \
 -      file://resize_framebuffer.diff;patch=1 \
 -      file://allow_different_demux.diff;patch=1"
+ SRC_URI_append_vuduo2 = " \
+       file://32bpp.diff;patch=1 \
+       file://resize_framebuffer.diff;patch=1 \
+       file://allow_different_demux.diff;patch=1"
++
+ SRC_URI_append_vusolo2 = " \
+       file://32bpp.diff;patch=1 \
+       file://resize_framebuffer.diff;patch=1 \
+       file://allow_different_demux.diff;patch=1"
+ 
  S = "${WORKDIR}/libs"
  EXTRA_OECONF = "--with-target=native"
  

diff --cc recipes/udev/udev_124.bb
index a582847,d18de14..648d491
--- 1/recipes/udev/udev_124.bb
--- 2/recipes/udev/udev_124.bb
+++ b/recipes/udev/udev_124.bb
@@@ -36,6 -36,9 +36,8 @@@ SRC_URI_append_bm750 = " file://41-od-l
  SRC_URI_append_vusolo = " file://41-od-linux-2.6.18-misc.rules"
  SRC_URI_append_vuuno = " file://41-od-linux-2.6.18-misc.rules"
  SRC_URI_append_vuultimo = " file://41-od-linux-2.6.18-misc.rules"
 -SRC_URI_append_vu7425 = " file://41-od-linux-2.6.18-misc.rules"
+ SRC_URI_append_vuduo2 = " file://41-od-linux-2.6.18-misc.rules"
+ SRC_URI_append_vusolo2 = " file://41-od-linux-2.6.18-misc.rules"
  
  
  require udev.inc

diff --cc recipes/vuplus/vuplus-dvb-modules.bb
index 8d4f18c,70affc2..1dc34cb
--- 1/recipes/vuplus/vuplus-dvb-modules.bb
--- 2/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@@ -32,9 -36,11 +36,13 @@@ PR = "r20-${SRCDATE}
  
  #hack
  DEPENDS = " module-init-tools"
+ DEPENDS_append_vusolo2 = " virtual/kernel"
+ DEPENDS_append_duo2 = " virtual/kernel"
  RDEPENDS_append_vuplus = " module-init-tools-depmod"
  
 -SRC_URI = "http://archive.vuplus.com/download/drivers/beta/private/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
 +SRC_URI = "http://archive.vuplus.com/download/drivers/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
++SRC_URI_vusolo2 = "http://archive.vuplus.com/download/drivers/beta/private/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
++SRC_URI_vuduo2 = "http://archive.vuplus.com/download/drivers/beta/private/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz "
  
  S = "${WORKDIR}"