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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-08-07 10:38:47 +02:00
parent e5ef733383
commit 84a66ee287
7 changed files with 6 additions and 52 deletions

View File

@ -10,18 +10,7 @@ PR = "r0"
inherit packagegroup inherit packagegroup
#
# Set by the machine configuration with packages essential for device bootup
#
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
btfilter \ btfilter \
bluez4 \ bluez4 \
${MACHINE_FIRMWARE} \ "
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
RRECOMMENDS_${PN} = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"

View File

@ -10,12 +10,6 @@ PR = "r0"
inherit packagegroup 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: # Distro can override the following VIRTUAL-RUNTIME providers:
VIRTUAL-RUNTIME_ftp-server ?= "vsftpd" VIRTUAL-RUNTIME_ftp-server ?= "vsftpd"
@ -39,9 +33,6 @@ RDEPENDS_${PN} = "\
${VIRTUAL-RUNTIME_network-utils} \ ${VIRTUAL-RUNTIME_network-utils} \
${VIRTUAL-RUNTIME_snmp-manager} \ ${VIRTUAL-RUNTIME_snmp-manager} \
${VIRTUAL-RUNTIME_ntp-client} \ ${VIRTUAL-RUNTIME_ntp-client} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" "
RDEPENDS_${PN}_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'kernel-module-smsc911x', '', d)}" RDEPENDS_${PN}_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'kernel-module-smsc911x', '', d)}"
RRECOMMENDS_${PN} = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"

View File

@ -10,12 +10,6 @@ PR = "r0"
inherit packagegroup 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 ?= ""
WIRELESS_MODULE_append_mx5 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}" 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)}' 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 \ wireless-tools \
crda \ crda \
${WIRELESS_MODULE} \ ${WIRELESS_MODULE} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" "
RDEPENDS_${PN}_append_mx5 = "${WIRELESS_MODULE}" RDEPENDS_${PN}_append_mx5 = "${WIRELESS_MODULE}"
RDEPENDS_${PN}_append_mxs = " iw ${WIRELESS_MODULE}" RDEPENDS_${PN}_append_mxs = " iw ${WIRELESS_MODULE}"
RRECOMMENDS_${PN} = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"

View File

@ -10,17 +10,8 @@ PR = "r0"
inherit packagegroup inherit packagegroup
#
# Set by the machine configuration with packages essential for device bootup
#
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
packagegroup-core-tools-debug \ packagegroup-core-tools-debug \
memwatch \ memwatch \
fbtest \ fbtest \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" "
RRECOMMENDS_${PN} = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"

View File

@ -16,7 +16,4 @@ RDEPENDS_${PN} = "\
qt4-demos \ qt4-demos \
qt4-examples \ qt4-examples \
fsl-gui-extrafiles \ fsl-gui-extrafiles \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" "
RRECOMMENDS_${PN} = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"

View File

@ -15,10 +15,6 @@ RDEPENDS_${PN} = "\
alsa-utils \ alsa-utils \
alsa-state \ alsa-state \
alsa-states \ alsa-states \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" "
RDEPENDS_${PN}_append_mx5 = " imx-audio" RDEPENDS_${PN}_append_mx5 = " imx-audio"
RRECOMMENDS_${PN} = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"

View File

@ -14,7 +14,6 @@ MACHINE_GSTREAMER_PLUGIN ?= ""
RDEPENDS_${PN} = " \ RDEPENDS_${PN} = " \
gst-meta-audio \ gst-meta-audio \
gst-meta-video \ gst-meta-video \
${MACHINE_FIRMWARE} \
${MACHINE_GSTREAMER_PLUGIN} \ ${MACHINE_GSTREAMER_PLUGIN} \
gst-fsl-plugin-gplay \ gst-fsl-plugin-gplay \
" "