Merge branch 'kernel31' of code.vuplus.com:/opt/repository/openembedded into kernel31

Conflicts:
	conf/machine/vuultimo.conf
	recipes/enigma2/enigma2.bb
	recipes/vuplus/vuplus-dvb-modules.bb

diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb
index 3325106..000b2d3 100644 (file)
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -67,7 +67,7 @@ DESCRIPTION_append_enigma2-plugin-systemplugins-crashreport = "automatically sen
 RDEPENDS_enigma2-plugin-systemplugins-crashreport = "twisted-mail twisted-names python-compression python-mime python-email"
 
 PN = "enigma2"
-PR = "r4"
+PR = "r5"
 
 SRCDATE = "20110922"
 SRCREV = "5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be"

diff --git a/recipes/vuplus/vuplus-dvb-modules.bb b/recipes/vuplus/vuplus-dvb-modules.bb
index 924695c..298aaf6 100755 (executable)
--- a/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@ -3,7 +3,6 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "proprietary"
 
-
 KV = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '2.6.18', '3.1.1', d)}"
 
 PV = "${KV}"
@@ -59,7 +58,5 @@ pkg_postinst_vuplus-dvb-modules () {
 }
 
 
-
-
 PACKAGE_ARCH := "${MACHINE_ARCH}"
 FILES_${PN} = "/"