Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus_3.0

diff --git a/meta-bsp/conf/machine/vusolo4k.conf b/meta-bsp/conf/machine/vusolo4k.conf
index 35eed41..3657ff3 100644 (file)
--- a/meta-bsp/conf/machine/vusolo4k.conf
+++ b/meta-bsp/conf/machine/vusolo4k.conf
@@ -20,7 +20,7 @@ VUPLUS_FEATURES += "dvbproxy"
 VUPLUS_FEATURES += "uianimation"
 VUPLUS_FEATURES += "xbmc"
 VUPLUS_FEATURES += "minitv"
-VUPLUS_FEATURES += "fastzap"
+#VUPLUS_FEATURES += "fastzap"
 
 IMAGE_UNPACK_PATH = "vuplus/solo4k"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 33643a0..1459829 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -231,7 +231,7 @@ DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugle
 RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libvugles2" , "", d)}"
 
 PN = "enigma2"
-PR = "r128"
+PR = "r129"
 
 inherit gitpkgv pythonnative
 

diff --git a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
index 58c6c56..683c511 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
@@ -2,7 +2,7 @@ SUMMARY = "Enigma2 set of packages for Vuplus"
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r9"
+PR = "r10"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -72,7 +72,6 @@ RDEPENDS_${PN} += " \
   ${@base_contains("VUPLUS_FEATURES", "uianimation", "enigma2-plugin-systemplugins-animationsetup", "", d)} \
   ${@base_contains("VUPLUS_FEATURES", "xbmc", "enigma2-plugin-extensions-xbmc", "", d)} \
   ${@base_contains("VUPLUS_FEATURES", "minitv", "enigma2-plugin-extensions-minitv", "", d)} \
-  ${@base_contains("VUPLUS_FEATURES", "fastzap", "enigma2-plugin-systemplugins-fastzapsupport", "", d)} \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"