From e5ef733383f4669491b8d345d7f66bc10bbe82dd Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 6 Aug 2013 18:27:55 +0200
Subject: [PATCH] packagegroup-dey-core: add MACHINE_EXTRA_RRECOMMENDS

This is needed so the kernel modules configured in the kernel defconfig
get added to the rootfs image.

At the same time there is no need to add the usb gadget modules
separately because they are added in the machine extra recommends as
well.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../recipes-core/packagegroups/packagegroup-dey-core.bb    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 0099227cb..88d96236a 100644
--- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
+++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
@@ -27,8 +27,6 @@ VIRTUAL-RUNTIME_keymaps ?= "keymaps"
 # Set device manager depending on X11 feature
 VIRTUAL-RUNTIME_dev_manager ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'udev', 'busybox-mdev', d)}"
 
-USB_GADGET_MODULES = '${@base_version_less_or_equal("PREFERRED_VERSION_linux-dey", "2.6.35.14", "kernel-module-g-ether kernel-module-g-file-storage kernel-module-g-serial", "kernel-module-g-ether kernel-module-g-mass-storage kernel-module-g-serial", d)}'
-
 RDEPENDS_${PN} = "\
     base-files \
     base-passwd \
@@ -49,8 +47,9 @@ RDEPENDS_${PN} = "\
     ubootenv \
     update-flash \
     usbutils \
-    ${@base_contains("MACHINE_FEATURES", "usbgadget", "${USB_GADGET_MODULES}", "",d)} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
 
 RRECOMMENDS_${PN} = "\
-    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
+    ${MACHINE_EXTRA_RRECOMMENDS} \
+"