From 8e7d3cc8ae829ee275d0a7209d1cedbeb7d1d5d0 Mon Sep 17 00:00:00 2001 From: Riku Voipio Date: Wed, 13 Nov 2013 11:25:21 +0200 Subject: fix inittab install when Xen not in DISTRO_FEATURES With the latest patch, OE builds may file like: https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.8,label=oe_persistent_cloud,rootfs=minimal/127/consoleText By having the "failing" grep within the if block, set -e in shell code will not bite configurations where meta-virtualization is included but xen is not in DISTRO_FEATURES. Signed-off-by: Riku Voipio Signed-off-by: Bruce Ashfield --- recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend index 2edbedf9..1b89aecd 100644 --- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend +++ b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend @@ -1,6 +1,5 @@ do_install_append() { - echo "${DISTRO_FEATURES}" | grep -q 'xen' - if [ $? -eq 0 ]; then + if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then echo "" >> ${D}${sysconfdir}/inittab echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab fi -- cgit v1.2.3-54-g00ecf