[oe] [meta-oe][PATCH v3 3/3] systemd: conditionally RRECOMMENDS kbd*

[Anders Darander]

If the machine lacks keyboard support, there is no need for kbd*-packages.

Signed-off-by: Anders Darander <anders at chargestorm.se>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 0fa61a7..56e5d82 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r8"
+PR = "r9"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -101,7 +101,7 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
 # of blacklist support, so use proper modprobe from module-init-tools
 # And pull in the kernel modules mentioned in INSTALL
 # swapon -p is also not supported by busybox
-RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
+RRECOMMENDS_${PN} += "${@base_contains("MACHINE_FEATURES", "keyboard", "kbd kbd-consolefonts", "", d)} \
                       systemd-serialgetty \
                       util-linux-agetty \
                       util-linux-swaponoff \
@@ -110,6 +110,9 @@ RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
                       kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
 "
 
+# RRECOMMENDS depends on MACHINE_FEATURES, thus this needs to be MACHINE_ARCH
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 # TODO:
 # u-a for runlevel and telinit
 
-- 
1.7.8.3