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

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-vuplus / e2openplugins / enigma2-plugin-extensions-openwebif.bb

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 1094752..c55df2f 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@ -6,15 +6,13 @@ LIC_FILES_CHKSUM = "file://README;firstline=10;lastline=12;md5=9c14f792d0aeb54e1
 DEPENDS = "python-cheetah-native"
 RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python-pyopenssl aio-grab"
 
-inherit gitpkgv
+inherit gitpkgv pythonnative
 PV = "0.1+git${SRCPV}"
 PKGV = "0.1+git${GITPKGV}"
-PR = "r0.74"
+PR = "r0.82"
 
 require openplugins.inc
 
-SRC_URI += "file://openwebif_8001_8002.patch;patch=1;pnum=1"
-
 # Just a quick hack to "compile" it
 do_compile() {
        cheetah-compile -R --nobackup ${S}/plugin
@@ -28,31 +26,32 @@ do_install() {
 }
 
 python do_package_prepend () {
-       boxtypes = [
-               ('bm750', 'duo.jpg', 'vu_normal.png'),
-               ('vuduo2', 'duo2.jpg', 'vu_ultimo.png'),
-               ('vusolo', 'solo.jpg', 'vu_normal.png'),
-               ('vusolo2', 'solo2.jpg', 'vu_ultimo.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'),
+        ('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}"