Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

Conflicts:
	meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb

diff --cc meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
index c55df2f,275d475..95909d0
--- 1/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
--- 2/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@@ -26,32 -26,33 +26,33 @@@ do_install() 
  }
  
  python do_package_prepend () {
 -      boxtypes = [
 -              ('bm750', 'duo.jpg', 'vu_normal.png'),
 -              ('vuduo2', 'duo2.jpg', 'vu_normal.png'),
 -              ('vusolo', 'solo.jpg', 'vu_normal.png'),
 -              ('vusolo2', 'solo2.jpg', 'vu_normal.png'),
 -              ('vusolose', 'solose.jpg', 'vu_normal.png'),
 -              ('vuzero', 'zero.jpg', 'vu_normal.png'),
 -              ('vuultimo', 'ultimo.jpg', 'vu_ultimo.png'),
 -              ('vuuno', 'uno.jpg', 'vu_normal.png'),
 -      ]
 -      import os
 -      top = '${D}${PLUGINPATH}/public/images/'
 -      target_box = 'unknown.jpg'
 -      target_remote = 'ow_remote.png'
 -      for x in boxtypes:
 -              if x[0] == '${MACHINE}':
 -                      target_box = x[1]
 -                      target_remote = x[2]
 -                      break
 -      for root, dirs, files in os.walk(top + 'boxes', topdown=False):
 -              for name in files:
 -                      if target_box != name and name != 'unknown.jpg':
 -                              os.remove(os.path.join(root, name))
 -      for root, dirs, files in os.walk(top + 'remotes', topdown=False):
 -              for name in files:
 -                      if target_remote != name and name != 'ow_remote.png':
 -                              os.remove(os.path.join(root, name))
 +    boxtypes = [
 +        ('bm750', 'duo.jpg', 'vu_normal.png'),
 +        ('vuduo2', 'duo2.jpg', 'vu_normal.png'),
 +        ('vusolo', 'solo.jpg', 'vu_normal.png'),
 +        ('vusolo2', 'solo2.jpg', 'vu_normal.png'),
 +        ('vusolose', 'solose.jpg', 'vu_normal.png'),
++        ('vuzero', 'zero.jpg', 'vu_normal.png'),
 +        ('vuultimo', 'ultimo.jpg', 'vu_ultimo.png'),
 +        ('vuuno', 'uno.jpg', 'vu_normal.png'),
 +    ]
 +    import os
 +    top = '${D}${PLUGINPATH}/public/images/'
 +    target_box = 'unknown.jpg'
 +    target_remote = 'ow_remote.png'
 +    for x in boxtypes:
 +        if x[0] == '${MACHINE}':
 +            target_box = x[1]
 +            target_remote = x[2]
 +            break
 +    for root, dirs, files in os.walk(top + 'boxes', topdown=False):
 +        for name in files:
 +            if target_box != name and name != 'unknown.jpg':
 +                os.remove(os.path.join(root, name))
 +    for root, dirs, files in os.walk(top + 'remotes', topdown=False):
 +        for name in files:
 +            if target_remote != name and name != 'ow_remote.png':
 +                os.remove(os.path.join(root, name))
  }
  
  FILES_${PN} = "${PLUGINPATH}"

diff --cc meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index c35ccc7,3ce6e87..1a7ec06
--- 1/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
--- 2/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@@ -88,14 -89,17 +88,14 @@@ RDEPENDS_enigma2-plugin-systemplugins-b
  RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
  
  PN = "enigma2"
- PR = "r82"
+ PR = "r90"
  
 -SRCDATE = "20121128"
 -#SRCDATE is NOT used by git to checkout a specific revision
 -#but we need it to build a ipk package version
 -#when you like to checkout a specific revision of e2 you need
 -#have to specify a commit id or a tag name in SRCREV
 +inherit gitpkgv pythonnative
  
  ####################################################
 +PV = "experimental-gitr${SRCPV}"
 +PKGV = "experimental-gitr${GITPKGV}"
  BRANCH = "vuplus_experimental"
 -PV = "experimental-git${SRCDATE}"
  SRCREV = ""
  ####################################################
  

diff --cc meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
index 1a9c266,f5477de..e6a4f37
--- 1/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
--- 2/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
+++ b/meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
@@@ -4,9 -4,9 +4,9 @@@ LIC_FILES_CHKSUM = "file://${COREBASE}/
  MAINTAINER = "Felix Domke <tmbinc@elitdvb.net>"
  
  PN = "tuxbox-common"
- PR = "r5"
+ PR = "r6"
  
 -SRC_REV = "HEAD"
 +SRC_REV = "12436bfb31dafdc4c73bc4bb5d4cb39a0855c95e"
  
  SRC_URI = "git://code.vuplus.com/git/dvbapp-meta.git;protocol=git;tag=${SRC_REV} "
  

diff --cc meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
index 8a58b99,ff40cde..8140269
--- 1/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
--- 2/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
+++ b/meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
@@@ -20,8 -20,6 +20,8 @@@ do_install() 
        install -m 0755 ${WORKDIR}/coldboot.sh ${D}/etc/init.d/coldboot.sh
        install -m 0755 ${WORKDIR}/ethwol.sh ${D}/etc/init.d/ethwol.sh
        install -m 0755 ${WORKDIR}/coldboot ${D}/usr/bin/coldboot
-         ln -sf   ../init.d/coldboot.sh ${D}${sysconfdir}/rc0.d/S30coldboot.sh
+         ln -sf   ../init.d/coldboot.sh ${D}${sysconfdir}/rc0.d/S50coldboot.sh
          ln -sf   ../init.d/ethwol.sh ${D}${sysconfdir}/rc0.d/K32ethwol.sh
  }
 +
 +INHIBIT_PACKAGE_STRIP = "1"