fix proxy driver RDEPENDS. (core-boot -> vuplus-base/enigma2)

diff --git a/meta-bsp/conf/machine/include/vuplus.inc b/meta-bsp/conf/machine/include/vuplus.inc
index b0d1917..88b5623 100644 (file)
--- a/meta-bsp/conf/machine/include/vuplus.inc
+++ b/meta-bsp/conf/machine/include/vuplus.inc
@@ -4,7 +4,6 @@ GLIBC_EXTRA_OECONF = "--with-tls --with-__thread"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-bootlogo"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-bootlogo"

-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${@base_contains("VUPLUS_FEATURES", "dvbproxy", "vuplus-dvb-proxy", "vuplus-dvb-modules", d)}"

 MACHINE_FEATURES += "kernel26 alsa pci wifi"
 
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
 MACHINE_FEATURES += "kernel26 alsa pci wifi"
 
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"

diff --git a/meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend b/meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend
index ec21862..147b996 100644 (file)
--- a/meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend
+++ b/meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend
@@ -1,2 +1,2 @@
-PR .= "-vuplus1"
+PR .= "-vuplus2"

 
 

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index cb79fc4..3bb86b0 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -62,6 +62,7 @@ RDEPENDS_${PN} = " \
        fuse-exfat \
        util-linux-partx \
        vuplus-skins \
        fuse-exfat \
        util-linux-partx \
        vuplus-skins \

+       ${@base_contains("VUPLUS_FEATURES", "dvbproxy", "vuplus-dvb-proxy libgles vuplus-platform-util", "vuplus-dvb-modules", d)} \

        "
 
 PYTHON_RDEPS = " \
        "
 
 PYTHON_RDEPS = " \


@@ -227,10 +228,10 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extension
 RDEPENDS_enigma2-plugin-extensions-satipclient = "satipclient"
 
 DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
 RDEPENDS_enigma2-plugin-extensions-satipclient = "satipclient"
 
 DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"

-RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
+RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libvugles2" , "", d)}"

 
 PN = "enigma2"
 
 PN = "enigma2"

-PR = "r123"
+PR = "r124"

 
 inherit gitpkgv pythonnative
 
 
 inherit gitpkgv pythonnative
 

diff --git a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb
index 0f4e341..7213178 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb
+++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb
@@ -2,7 +2,7 @@ SUMMARY = "Vuplus: Base set of packages for Vuplus."
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"

-PR = "r4"
+PR = "r5"

 
 inherit packagegroup
 
 
 inherit packagegroup
 


@@ -35,7 +35,7 @@ VUPLUS_BASE_ESSENTIAL = "\
     killall \
     openresolv \
     module-init-tools \
     killall \
     openresolv \
     module-init-tools \

-    ${@base_contains("VUPLUS_FEATURES", "dvbproxy", "libgles vuplus-platform-util", "", d)} \
+    ${@base_contains("VUPLUS_FEATURES", "dvbproxy", "vuplus-dvb-proxy libgles vuplus-platform-util", "vuplus-dvb-modules", d)} \

 "
 
 VUPLUS_FIRMWARE_DVB = " \
 "
 
 VUPLUS_FIRMWARE_DVB = " \