dreambox-image, enigma2-plugins: fix rel 2.4 build

diff --git a/packages/enigma2/enigma2-plugins.bb b/packages/enigma2/enigma2-plugins.bb
index 8dcf26e..68f88c3 100644 (file)
--- a/packages/enigma2/enigma2-plugins.bb
+++ b/packages/enigma2/enigma2-plugins.bb
@@ -25,6 +25,13 @@ inherit autotools
 
 S = "${WORKDIR}/enigma2-plugins"
 
+DEPENDS = "${@get_version_depends(bb, d)}"
+
+def get_version_depends(bb, d):
+       if bb.data.getVar('REL_MINOR', d, 1) > '4':
+               return "python-pyopenssl"
+       return ""
+
 python populate_packages_prepend () {
        enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
 

diff --git a/packages/images/dreambox-image.bb b/packages/images/dreambox-image.bb
index d7eaab9..afcbc6e 100644 (file)
--- a/packages/images/dreambox-image.bb
+++ b/packages/images/dreambox-image.bb
@@ -24,7 +24,6 @@ OPENDREAMBOX_EXPERIMENTAL_R = "enigma2-plugin-systemplugins-frontprocessorupgrad
        enigma2-plugin-systemplugins-configurationbackup \
        enigma2-plugin-systemplugins-satfinder \
        enigma2-plugin-systemplugins-videotune \
-       enigma2-plugin-systemplugins-networkwizard \
        enigma2-plugin-extensions-mediascanner \
        enigma2-plugin-extensions-webinterface \
        enigma2-plugin-extensions-graphmultiepg \
@@ -32,12 +31,16 @@ OPENDREAMBOX_EXPERIMENTAL_R = "enigma2-plugin-systemplugins-frontprocessorupgrad
        enigma2-plugin-extensions-pictureplayer \
        enigma2-plugin-extensions-mediaplayer \
        enigma2-plugin-systemplugins-hotplug \
-       enigma2-plugin-systemplugins-defaultservicesscanner \
        enigma2-streamproxy \
-       enigma2-defaultservices \
        twisted-web2 twisted python-crypt python-crypto \
        python-netserver python-pickle dreambox-blindscan-utils"
 
+#this packages dont exist with enigma2, enigma2-plugins 2.4
+OPENDREAMBOX_EXPERIMENTAL_R_append_dm8000 = " \
+       enigma2-plugin-systemplugins-defaultservicesscanner \
+       enigma2-defaultservices \
+       enigma2-plugin-systemplugins-networkwizard"
+
 # legacy tuxbox stuff (enigma, plugins, ...)
 OPENDREAMBOX_TUXBOX = "enigma ipkgpl"
 OPENDREAMBOX_TUXBOX_D = "tuxbox-plugins tuxbox-plugins-enigma links-dream"