From 0dc6b44dee1c517a09ebbad8229b8ac14d719421 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 15 Jan 2014 17:32:30 +0100 Subject: [PATCH] meta-digi: do not hardcode machine related utilities nvram, ubootenv and update_flash are machine related utilities. They need to be configured per-platform via MACHINE_EXTRA_RDEPENDS and thus leaving packagegroup-dey-core as much platform-agnostic as possible. This also allows to skip these utilities for platforms not using them. https://jira.digi.com/browse/DEL-915 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccardimx28.inc | 2 ++ meta-digi-arm/conf/machine/include/ccimx51.inc | 1 + meta-digi-arm/conf/machine/include/ccimx53.inc | 2 ++ .../recipes-core/packagegroups/packagegroup-dey-core.bb | 7 +++---- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index 4172fafeb..6b126706a 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -13,6 +13,8 @@ WPA_DRIVER = "nl80211" # Firmware MACHINE_FIRMWARE = "firmware-mxs-ar3k" + +MACHINE_EXTRA_RDEPENDS += "nvram ubootenv update-flash" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_FEATURES += "alsa touchscreen" diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc index 5a76b3d7d..bd6e7371a 100644 --- a/meta-digi-arm/conf/machine/include/ccimx51.inc +++ b/meta-digi-arm/conf/machine/include/ccimx51.inc @@ -11,6 +11,7 @@ UBOOT_ENTRYPOINT = "0x90008000" # Firmware MACHINE_FIRMWARE = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" +MACHINE_EXTRA_RDEPENDS += "nvram ubootenv update-flash" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x" diff --git a/meta-digi-arm/conf/machine/include/ccimx53.inc b/meta-digi-arm/conf/machine/include/ccimx53.inc index 3222bfa3d..907dcce0f 100644 --- a/meta-digi-arm/conf/machine/include/ccimx53.inc +++ b/meta-digi-arm/conf/machine/include/ccimx53.inc @@ -10,6 +10,8 @@ UBOOT_ENTRYPOINT = "0x70008000" # Firmware MACHINE_FIRMWARE = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" + +MACHINE_EXTRA_RDEPENDS += "nvram ubootenv update-flash" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x" diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb index 5dc88b0f2..65edba3a2 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -39,7 +39,6 @@ RDEPENDS_${PN} = "\ modutils-initscripts \ mtd-utils-ubifs \ netbase \ - nvram \ init-ifupdown \ ${VIRTUAL-RUNTIME_dev_manager} \ ${VIRTUAL-RUNTIME_init_manager} \ @@ -47,11 +46,11 @@ RDEPENDS_${PN} = "\ ${VIRTUAL-RUNTIME_login_manager} \ ${VIRTUAL-RUNTIME_passwd_manager} \ ${VIRTUAL-RUNTIME_update-alternatives} \ - ubootenv \ - update-flash \ usbutils \ busybox-acpid \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ + ${MACHINE_EXTRA_RDEPENDS} \ +" RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \