[oe-commits] org.oe.dreambox dreambox-image, enigma2-plugins: fix rel 2.4 build

[tmbinc commit]

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

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 0682f3ebf52742ac0aeec4636ffea01a70e3b26b
ViewMTN: http://monotone.openembedded.org/revision/info/0682f3ebf52742ac0aeec4636ffea01a70e3b26b
Files:
1
packages/enigma2/enigma2-plugins.bb
packages/images/dreambox-image.bb
Diffs:

#
# mt diff -rf5db6a6b29f31866a864553dc00c02276713a85f -r0682f3ebf52742ac0aeec4636ffea01a70e3b26b
#
#
#
# patch "packages/enigma2/enigma2-plugins.bb"
#  from [5c27a641c1524db12e6c844af95e67475f697b94]
#    to [b04c711f675fd30b4500e1f0781d9ec2178b46dc]
# 
# patch "packages/images/dreambox-image.bb"
#  from [e36658493199230041b2b2acbad8211d53042136]
#    to [b471fb43b418437fec828124f8ab8e59f98152d9]
#
============================================================
--- packages/enigma2/enigma2-plugins.bb	5c27a641c1524db12e6c844af95e67475f697b94
+++ packages/enigma2/enigma2-plugins.bb	b04c711f675fd30b4500e1f0781d9ec2178b46dc
@@ -25,6 +25,13 @@ S = "${WORKDIR}/enigma2-plugins"
 
 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)
 
============================================================
--- packages/images/dreambox-image.bb	e36658493199230041b2b2acbad8211d53042136
+++ packages/images/dreambox-image.bb	b471fb43b418437fec828124f8ab8e59f98152d9
@@ -24,7 +24,6 @@ OPENDREAMBOX_EXPERIMENTAL_R = "enigma2-p
 	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-p
 	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"