From patchwork Mon Nov 11 14:01:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 21444 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2DD6A244E4 for ; Mon, 11 Nov 2013 14:01:39 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id gq1sf14899665obb.5 for ; Mon, 11 Nov 2013 06:01:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=fHlUoh955xZYPsRd82fECqxf/hafIZk77U58/L6vAps=; b=mGKgeqBK2n2HatIEAq8+JEFPeUpEwUyYVDDMgkDngPjGuFmoxLgrk1//j9UiLnWHsf i9nO9SIAtIkZhdyj7G1Kv6QzJjpzwjtg2PEwhFVMsbWN0gO9dsVQZq6aiDXuWtO0bvJP MA6xWLFtdir4K305Cr9ZkoYOUeo4n5IPxZa6f1Lpm9Po2r4Lm26qczEZ+7DX5Lc74TlA BP/g8DzVyaB3Bv62iJijB3A4S7M+h8UaPBYPsg0R2sAX7z8CT8EpHaDmBLkHBskDgwLX vqNXTLMgCA0Ro6Bzah+Fwn9k4IIWWw4e4f6E2MNyl7ElveALmDKcscNBRrva4vLzkWfW VGGg== X-Gm-Message-State: ALoCoQmdEnfzKg5MixibYYY4xr0Pigr1g1yh6Q3FA4nmKaRG9Ezf+73+qzc+FMgUTgECm3ZbrwdO X-Received: by 10.50.164.198 with SMTP id ys6mr5853698igb.5.1384178499375; Mon, 11 Nov 2013 06:01:39 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.29.200 with SMTP id m8ls2488674qeh.1.gmail; Mon, 11 Nov 2013 06:01:39 -0800 (PST) X-Received: by 10.58.254.200 with SMTP id ak8mr24233796ved.12.1384178499256; Mon, 11 Nov 2013 06:01:39 -0800 (PST) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id tw10si9730839vec.82.2013.11.11.06.01.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 11 Nov 2013 06:01:39 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id jz11so2123156veb.22 for ; Mon, 11 Nov 2013 06:01:39 -0800 (PST) X-Received: by 10.52.165.131 with SMTP id yy3mr3568173vdb.25.1384178499165; Mon, 11 Nov 2013 06:01:39 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp92827vcz; Mon, 11 Nov 2013 06:01:38 -0800 (PST) X-Received: by 10.180.208.49 with SMTP id mb17mr12447689wic.64.1384178498016; Mon, 11 Nov 2013 06:01:38 -0800 (PST) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id gr6si4770567wib.2.2013.11.11.06.01.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 11 Nov 2013 06:01:38 -0800 (PST) Received-SPF: neutral (google.com: 92.243.29.197 is neither permitted nor denied by best guess record for domain of riku.voipio@linaro.org) client-ip=92.243.29.197; Received: from aimless.elisa-laajakaista.fi (91-157-196-38.elisa-laajakaista.fi [91.157.196.38]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 7DFCF2654C; Mon, 11 Nov 2013 15:01:35 +0100 (CET) From: Riku Voipio To: meta-virtualization@yoctoproject.org Cc: patches@linaro.org, koen.kooi@linaro.org, Riku Voipio Subject: [meta-virtualization][PATCH] fix inittab install when Xen not in DISTRO_FEATURES Date: Mon, 11 Nov 2013 16:01:33 +0200 Message-Id: <1384178493-15854-1-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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 2edbedf..1b89aec 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