modify recipes/enigma2.

modify enigma2.bb, enigma2-plugins.bb, enigma2-skins.bb to fix wrong additions.

diff --git a/recipes/enigma2/enigma2-plugins.bb b/recipes/enigma2/enigma2-plugins.bb
index f0ac7f2..5413255 100644 (file)
--- a/recipes/enigma2/enigma2-plugins.bb
+++ b/recipes/enigma2/enigma2-plugins.bb
@@ -39,18 +39,13 @@ inherit autotools
 S = "${WORKDIR}/enigma2-plugins"
 
 DEPENDS = "python-pyopenssl python-gdata streamripper python-mutagen"
-DEPENDS_vuplus = "${@get_version_depends(bb, d)}"
 DEPENDS += "enigma2"
 
-def get_version_depends(bb, d):
-       if bb.data.getVar('REL_MINOR', d, 1) > '4':
-               return "python-pyopenssl"
-       return ""
-
 do_install_append_vuplus() {
        install -m 0644 ${WORKDIR}/dreamboxweb.png ${D}/usr/lib/enigma2/python/Plugins/Extensions/WebInterface/web-data/img/
        install -m 0644 ${WORKDIR}/favicon.ico ${D}/usr/lib/enigma2/python/Plugins/Extensions/WebInterface/web-data/img/
 }
+
 python populate_packages_prepend () {
        enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
 
@@ -84,27 +79,3 @@ python populate_packages_prepend () {
        for package in bb.data.getVar('PACKAGES', d, 1).split():
                getControlLines(mydir, d, package.split('-')[-1])
 }
-
-python populate_packages_prepend_vuplus () {
-       enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
-
-       do_split_packages(d, enigma2_plugindir, '(.*?/.*?)/.*', 'enigma2-plugin-%s', 'Enigma2 Plugin: %s', recursive=True, match_path=True, prepend=True)
-
-       def getControlLines(mydir, d, package):
-               import os
-               try:
-                       src = open(mydir + package + "/CONTROL/control").read()
-               except IOError:
-                       return
-               for line in src.split("\n"):
-                       if line.startswith('Package: '):
-                               full_package = line[9:]
-                       if line.startswith('Depends: '):
-                               bb.data.setVar('RDEPENDS_' + full_package, ' '.join(line[9:].split(', ')), d)
-                       if line.startswith('Description: '):
-                               bb.data.setVar('DESCRIPTION_' + full_package, line[13:], d)
-
-       mydir = bb.data.getVar('D', d, 1) + "/../enigma2-plugins/"
-       for package in bb.data.getVar('PACKAGES', d, 1).split():
-               getControlLines(mydir, d, package.split('-')[-1])
-}

diff --git a/recipes/enigma2/enigma2-skins.bb b/recipes/enigma2/enigma2-skins.bb
index 8d14cec..620cc64 100644 (file)
--- a/recipes/enigma2/enigma2-skins.bb
+++ b/recipes/enigma2/enigma2-skins.bb
@@ -17,8 +17,8 @@ PV = "experimental-cvs${SRCDATE}"
 # if vuplus
 REL_MAJOR="2"
 REL_MINOR="6"
-PV = "${REL_MAJOR}.${REL_MINOR}cvs${SRCDATE}"
-PR = "r1"
+PV_vuplus = "${REL_MAJOR}.${REL_MINOR}cvs${SRCDATE}"
+PR_vuplus = "r1"
 
 SRC_URI = "cvs://anonymous@cvs.schwerkraft.elitedvb.net/cvsroot/enigma2-skins;module=enigma2-skins;method=pserver${TAG};date=${SRCDATE}"
 
@@ -40,14 +40,6 @@ python populate_packages_prepend () {
        do_split_packages(d, enigma2_skindir, '(.*?)/.*', 'enigma2-skin-%s', 'Enigma2 Skin: %s', recursive=True, match_path=True, prepend=True)
 }
 
-python populate_packages_prepend_vuplus () {
-       if bb.data.expand('${REL_MINOR}', d) != "4":
-               enigma2_skindir = bb.data.expand('${datadir}/enigma2', d)
-               do_split_packages(d, enigma2_skindir, '(.*?)/.*', 'enigma2-skin-%s', 'Enigma2 Skin: %s', recursive=True, match_path=True, prepend=True)
-        for package in bb.data.getVar('PACKAGES', d, 1).split():
-               bb.data.setVar('RDEPENDS_' + package, ' enigma2(>=2.6git20091201) enigma2-plugin-systemplugins-skinselector(>=2.6git20091201-r0)', d)
-}
-
 python populate_packages_append () {
        enigma2_skindir = bb.data.expand('${datadir}/enigma2', d)
 

diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb
index 09a9980..b571996 100644 (file)
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -14,7 +14,6 @@ RDEPENDS = "python-codecs python-core python-lang python-re python-threading \
        gst-plugin-neonhttpsrc gst-plugin-mpegaudioparse gst-plugin-subparse \
        gst-plugin-apetag gst-plugin-icydemux gst-plugin-autodetect \
        glibc-gconv-iso8859-15 ethtool"
-RDEPENDS_append_vuplus = " python-gdata"
 
 RDEPENDS_append_dm7020 = " gst-plugin-ossaudio gst-plugin-ivorbisdec"
 RDEPENDS_append_dm7025 = " gst-plugin-alsa alsa-conf gst-plugin-ivorbisdec"
@@ -135,7 +134,6 @@ bindir = "/usr/bin"
 sbindir = "/usr/sbin"
 
 EXTRA_OECONF = "--with-target=native --with-libsdl=no"
-EXTRA_OECONF_append_vuplus = " --enable-maintainer-mode"
 
 do_compile_prepend_vuplus() {
         install -m 0755 ${WORKDIR}/MyriadPro-Regular.otf ${S}/data/fonts/
@@ -165,13 +163,6 @@ python populate_packages_prepend () {
        do_split_packages(d, enigma2_plugindir, '(.*?/.*?)/.*', 'enigma2-plugin-%s', '%s ', recursive=True, match_path=True, prepend=True)
 }
 
-python populate_packages_prepend_vuplus () {
-       enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
-
-       do_split_packages(d, enigma2_plugindir, '(.*?/.*?)/.*', 'enigma2-plugin-%s', '%s ', recursive=True, match_path=True, prepend=True, extra_depends="enigma2")
-}
-
-
 do_stage() {
        install -d ${STAGING_INCDIR}/enigma2
        install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/enigma2