From 2d2013e8dae7a9d3d731bad3da4c85a523e834b4 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 12 Mar 2014 19:04:31 +0100 Subject: [PATCH] meta-digi: install mtd-utils-ubifs only in machines with flash memory The ccimx6 does not have flash memory so there is no need to install mtd-utils. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccardimx28.inc | 2 +- meta-digi-arm/conf/machine/include/ccimx51.inc | 2 +- meta-digi-arm/conf/machine/include/ccimx53.inc | 2 +- .../recipes-core/packagegroups/packagegroup-dey-core.bb | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index c80779baa..d57740782 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -16,7 +16,7 @@ WPA_DRIVER = "nl80211" # Firmware MACHINE_FIRMWARE = "firmware-atheros-ar3k" -MACHINE_EXTRA_RDEPENDS += "nvram ubootenv update-flash" +MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs 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 29b7884ef..02f9672dd 100644 --- a/meta-digi-arm/conf/machine/include/ccimx51.inc +++ b/meta-digi-arm/conf/machine/include/ccimx51.inc @@ -14,7 +14,7 @@ UBOOT_SUFFIX = "bin" # Firmware MACHINE_FIRMWARE = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" -MACHINE_EXTRA_RDEPENDS += "nvram ubootenv update-flash" +MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs 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 267cffcd4..df56d07aa 100644 --- a/meta-digi-arm/conf/machine/include/ccimx53.inc +++ b/meta-digi-arm/conf/machine/include/ccimx53.inc @@ -14,7 +14,7 @@ UBOOT_SUFFIX = "bin" # Firmware MACHINE_FIRMWARE = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" -MACHINE_EXTRA_RDEPENDS += "nvram ubootenv update-flash" +MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs 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 1fc68bf18..3b2adb54f 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -37,7 +37,6 @@ RDEPENDS_${PN} = "\ ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "${VIRTUAL-RUNTIME_touchscreen}", "",d)} \ modutils-initscripts \ - mtd-utils-ubifs \ netbase \ init-ifupdown \ ${VIRTUAL-RUNTIME_dev_manager} \