Merge remote-tracking branch 'oe21/master' into vuplus-3.0

Conflicts:
	meta-openvuplus/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
	meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb

diff --git a/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb b/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb
index fee7a5c..c1258ae 100755 (executable)
--- a/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb
+++ b/meta-bsp/common/recipes/vuplus/vuplus-blindscan-utils.bb
@@ -5,7 +5,7 @@ RDEPENDS_${PN} = "ncurses"
 
 LICENSE = "CLOSED"
 
-PV = "3.6"
+PV = "3.7"
 PR = "r1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -70,6 +70,6 @@ do_install_vusolose() {
        done
 }
 
-SRC_URI[md5sum] = "b10ee7d7896611fa2c710ba002bcf678"
-SRC_URI[sha256sum] = "7ee73c4ed84a8e11ae2e34d7e5ce8ef55f4a9f41f692e6b614317c27868d6991"
+SRC_URI[md5sum] = "94873fcb634bf4f9519c39bceb4b5a6f"
+SRC_URI[sha256sum] = "70c4dc7afba1f70bc7be51ad7a0785b99d12cf874b43a653deddcf86ef736c71"
 

diff --git a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend
index 310067d..823e5f2 100644 (file)
--- a/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vusolose/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20141021"
+SRCDATE = "20141205"
 
 MODULES_NAME = "procmk\ndvb-bcm7241\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "c5c2665057bda415ebdec20f32dd318d"
-SRC_URI[sha256sum] = "964f8c5b9ef0c392a7a9a4491ce20ecaca13598f4713e3706d5206d20e8f5483"
+SRC_URI[md5sum] = "d49819765c7e598476bad8559342571e"
+SRC_URI[sha256sum] = "a50e6ed78b9e8a3b65d6d04bb9e54586f74182624f86db41cdb112aa90aca27e"

diff --git a/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend
index 36862a5..44b119a 100644 (file)
--- a/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vuzero/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,6 +1,6 @@
-SRCDATE = "20141117"
+SRCDATE = "20141205"
 
 MODULES_NAME = "procmk\ndvb-bcm7362\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "0bc361756b6bd69b5643e1cd5707268b"
-SRC_URI[sha256sum] = "eb7c9b9e26c693b9e62ee6061b59130f90850fd9e63832e4b60c4dfb122a48ad"
+SRC_URI[md5sum] = "d5940eebf26ba488a6088f303cfe490b"
+SRC_URI[sha256sum] = "630beefb2681cd39d7a18be233dfb0b05e1d52eddef6d663f9d8fda8859dd574"

diff --git a/meta-openvuplus/recipes-extended/hddtemp/hddtemp_0.3-beta15.bb b/meta-openvuplus/recipes-extended/hddtemp/hddtemp_0.3-beta15.bb
index 1776e2a..347e2b9 100644 (file)
--- a/meta-openvuplus/recipes-extended/hddtemp/hddtemp_0.3-beta15.bb
+++ b/meta-openvuplus/recipes-extended/hddtemp/hddtemp_0.3-beta15.bb
@@ -2,10 +2,10 @@ SUMMARY = "Hard disk temperature monitor daemon"
 SECTION = "console/network"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://GPL-2;md5=eb723b61539feef013de476e68b5c50a"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://download.savannah.nongnu.org/releases/${PN}/${PN}-${PV}.tar.bz2;name=tar \
-           http://download.savannah.nongnu.org/releases/${PN}/hddtemp.db;name=db \
+SRC_URI = "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/${PN}/${PN}-${PV}.tar.bz2;name=tar \
+           http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/${PN}/hddtemp.db;name=db \
           file://hddtemp-no-nls-support.patch"
 SRC_URI[tar.md5sum] = "8b829339e1ae9df701684ec239021bb8"
 SRC_URI[tar.sha256sum] = "618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b"

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index ce8dd8d..ba0752b 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -88,7 +88,7 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 PN = "enigma2"
-PR = "r91"
+PR = "r92"
 
 inherit gitpkgv pythonnative
 

diff --git a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
index 784a777..3cd2631 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = '${ESSENTIAL_RDEPENDS}'
 RRECOMMENDS_${PN} = '${ESSENTIAL_RRECOMMENDS}'
 RRECOMMENDS_${PN} += '${KERNEL_DVB_MODULES}'
 
-PR = "r5"
+PR = "r6"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -87,7 +87,12 @@ KERNEL_MEDIA_USB_ADAPTERS = " \
   ${DVB_USB_V2} \
   kernel-module-dvb-ttusb-budget \
   kernel-module-smsusb \
+  kernel-module-smsdvb \
+  kernel-module-smsmdtv \
+  kernel-module-b2c2-flexcop \
   kernel-module-b2c2-flexcop-usb \
+  kernel-module-tveeprom \
+  kernel-module-cypress-firmware \
 "
 
 KERNEL_MEDIA_CUSTOMIZE_TV_TUNER = " \