From 84a66ee287f0db3735383124d5648ae6029ec9ff Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 7 Aug 2013 10:38:47 +0200 Subject: [PATCH] meta-digi-dey: simplify packagegroup recipes The MACHINE_ESSENTIAL_EXTRA_* vars need to be only in the 'packagegroup-dey-core' recipe not in the rest of the packagegroups. Signed-off-by: Javier Viguera --- .../packagegroups/packagegroup-dey-bluetooth.bb | 13 +------------ .../packagegroups/packagegroup-dey-network.bb | 11 +---------- .../packagegroups/packagegroup-dey-wireless.bb | 11 +---------- .../packagegroups/packagegroup-dey-debug.bb | 11 +---------- .../packagegroups/packagegroup-dey-qt.bb | 5 +---- .../packagegroups/packagegroup-dey-audio.bb | 6 +----- .../packagegroups/packagegroup-dey-gstreamer.bb | 1 - 7 files changed, 6 insertions(+), 52 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb index d763e38c1..82862bddd 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb @@ -10,18 +10,7 @@ PR = "r0" inherit packagegroup -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - RDEPENDS_${PN} = "\ btfilter \ bluez4 \ - ${MACHINE_FIRMWARE} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" - -RRECOMMENDS_${PN} = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" - +" diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb index d31da8511..fefbb1f03 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb @@ -10,12 +10,6 @@ PR = "r0" inherit packagegroup -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - # Distro can override the following VIRTUAL-RUNTIME providers: VIRTUAL-RUNTIME_ftp-server ?= "vsftpd" @@ -39,9 +33,6 @@ RDEPENDS_${PN} = "\ ${VIRTUAL-RUNTIME_network-utils} \ ${VIRTUAL-RUNTIME_snmp-manager} \ ${VIRTUAL-RUNTIME_ntp-client} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" +" RDEPENDS_${PN}_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'kernel-module-smsc911x', '', d)}" - -RRECOMMENDS_${PN} = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb index e7c5505d1..421e2f725 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -10,12 +10,6 @@ PR = "r0" inherit packagegroup -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - WIRELESS_MODULE ?= "" WIRELESS_MODULE_append_mx5 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}" ATHEROS_WIRELESS_MODULE = '${@base_version_less_or_equal("PREFERRED_VERSION_linux-dey", "2.6.35.14", "kernel-module-atheros", "", d)}' @@ -26,10 +20,7 @@ RDEPENDS_${PN} = "\ wireless-tools \ crda \ ${WIRELESS_MODULE} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" +" RDEPENDS_${PN}_append_mx5 = "${WIRELESS_MODULE}" RDEPENDS_${PN}_append_mxs = " iw ${WIRELESS_MODULE}" - -RRECOMMENDS_${PN} = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb index b91a7660f..d567d8360 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-debug.bb @@ -10,17 +10,8 @@ PR = "r0" inherit packagegroup -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - RDEPENDS_${PN} = "\ packagegroup-core-tools-debug \ memwatch \ fbtest \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" - -RRECOMMENDS_${PN} = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" +" diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb index c3014f248..ffd4056a6 100644 --- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb +++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb @@ -16,7 +16,4 @@ RDEPENDS_${PN} = "\ qt4-demos \ qt4-examples \ fsl-gui-extrafiles \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" - -RRECOMMENDS_${PN} = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" +" diff --git a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb index 289bde4ce..32aa8e0c2 100644 --- a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb +++ b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb @@ -15,10 +15,6 @@ RDEPENDS_${PN} = "\ alsa-utils \ alsa-state \ alsa-states \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" - +" RDEPENDS_${PN}_append_mx5 = " imx-audio" - -RRECOMMENDS_${PN} = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb index 2122e8f0f..1d36d9553 100644 --- a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb +++ b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb @@ -14,7 +14,6 @@ MACHINE_GSTREAMER_PLUGIN ?= "" RDEPENDS_${PN} = " \ gst-meta-audio \ gst-meta-video \ - ${MACHINE_FIRMWARE} \ ${MACHINE_GSTREAMER_PLUGIN} \ gst-fsl-plugin-gplay \ "