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

diff --git a/meta-bsp/vusolo2/recipes/vuplus/vuplus-blindscan-utils.bbappend b/meta-bsp/vusolo2/recipes/vuplus/vuplus-blindscan-utils.bbappend
index 7928748..56dd382 100644 (file)
--- a/meta-bsp/vusolo2/recipes/vuplus/vuplus-blindscan-utils.bbappend
+++ b/meta-bsp/vusolo2/recipes/vuplus/vuplus-blindscan-utils.bbappend
@@ -1,4 +1,4 @@
-PR .= "vuplus0"
+PR .= "vuplus1"
 
-SRC_URI[md5sum] = "03d33d3b0f529bb543a23dade3038d45"
-SRC_URI[sha256sum] = "66b49229cd697f8574620f02026ef25e747a16218f199b7567543188c700a7b8"
+SRC_URI[md5sum] = "71837506e03837679c703187ed4c87dd"
+SRC_URI[sha256sum] = "b589a1280f568e7c0f0d1c9a33bb2ba4e5c4a7dbed4d77c5894c75e14274c714"

diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
index bdf2242..3902055 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@ -9,7 +9,7 @@ RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python
 inherit gitpkgv
 PV = "0.1+git${SRCPV}"
 PKGV = "0.1+git${GITPKGV}"
-PR = "r0.73"
+PR = "r0.75"
 
 require openplugins.inc
 
@@ -27,5 +27,33 @@ do_install() {
        cp -rp ${S}/plugin/* ${D}${PLUGINPATH}
 }
 
+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'),
+               ('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}"
 PACKAGES = "${PN}"