From c654f5798e1600a7bd43dbe8283a8ea962746bc8 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 16 Apr 2013 17:13:09 +0200 Subject: [PATCH] meta-digi: Move inclusion of wireless drivers to del-wireless. Remove the machine rdepends and move to del-wireless which is only included for the wifi machine feature. Signed-off-by: Alex Gonzalez --- meta-digi-arm/conf/machine/ccardimx28js.conf | 3 --- meta-digi-arm/conf/machine/ccimx51js.conf | 2 +- meta-digi-arm/conf/machine/ccimx53js.conf | 2 +- meta-digi-arm/conf/machine/cpx2.conf | 1 - .../packagegroups/packagegroup-del-wireless.bb | 5 +++++ 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf index 6b0dba853..29cf26535 100644 --- a/meta-digi-arm/conf/machine/ccardimx28js.conf +++ b/meta-digi-arm/conf/machine/ccardimx28js.conf @@ -26,7 +26,4 @@ WPA_DRIVER = "nl80211" # Firmware MACHINE_FIRMWARE = "firmware-mxs-ar3k" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-atheros" - MACHINE_FEATURES += "alsa touchscreen" diff --git a/meta-digi-arm/conf/machine/ccimx51js.conf b/meta-digi-arm/conf/machine/ccimx51js.conf index 1881a6d42..0f47241a0 100644 --- a/meta-digi-arm/conf/machine/ccimx51js.conf +++ b/meta-digi-arm/conf/machine/ccimx51js.conf @@ -22,6 +22,7 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pmic-battery \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-redpine \" module_autoload_mma7455l = "mma7455l" module_autoload_scc2_driver = "scc2_driver" @@ -29,4 +30,3 @@ module_autoload_sahara = "sahara" module_autoload_mt9v111_camera = "mt9v111_camera" module_autoload_pmic_battery = "pmic_battery" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine" diff --git a/meta-digi-arm/conf/machine/ccimx53js.conf b/meta-digi-arm/conf/machine/ccimx53js.conf index 61e4938cb..559708831 100644 --- a/meta-digi-arm/conf/machine/ccimx53js.conf +++ b/meta-digi-arm/conf/machine/ccimx53js.conf @@ -20,10 +20,10 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-redpine \" module_autoload_mma7455l = "mma7455l" module_autoload_scc2_driver = "scc2_driver" module_autoload_sahara = "sahara" module_autoload_mt9v111_camera = "mt9v111_camera" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-redpine" diff --git a/meta-digi-arm/conf/machine/cpx2.conf b/meta-digi-arm/conf/machine/cpx2.conf index 744719079..7967fb1a8 100644 --- a/meta-digi-arm/conf/machine/cpx2.conf +++ b/meta-digi-arm/conf/machine/cpx2.conf @@ -27,4 +27,3 @@ WPA_DRIVER = "nl80211" MACHINE_FIRMWARE = "firmware-mxs-ar3k" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" -#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-atheros" diff --git a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb index a9474bbce..140576603 100644 --- a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb +++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb @@ -23,5 +23,10 @@ RDEPENDS_${PN} = "\ iw \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" +RDEPENDS_${PN}_append_ccimx51js = "kernel-module-redpine" +RDEPENDS_${PN}_append_ccimx53js = "kernel-module-redpine" +RDEPENDS_${PN}_append_ccardimx28js = "kernel-module-atheros" +RDEPENDS_${PN}_append_cpx2 = "kernel-module-atheros" + RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"