From patchwork Thu Jul 23 14:32:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_Zieth=C3=A9n?= X-Patchwork-Id: 51398 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id D2B5822A9E for ; Thu, 23 Jul 2015 14:33:14 +0000 (UTC) Received: by wilm20 with SMTP id m20sf47642917wil.2 for ; Thu, 23 Jul 2015 07:33:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:mime-version:subject:precedence :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:content-type:content-transfer-encoding:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list; bh=5CeMATvLqyxirk0sJRT5IZIoOA08ujKe2R7biotFKGQ=; b=hZjv8lMT6FecXkW558+bp4cCIPhR5XR8mIe6ZSE3Z45ED6/2VEgFBlvNRxXzekBJ7X HcCGsIC2LYIKPuJg7oRse0LqMjg5Sl7W4Z5ZAJRpg97qfkSSDWCkH3m5Tw7Gz6crTaVh U9/EijUAagaxVEN7AycKQLHRCri3Swicx413lk/weS4hbK+NhHXSxIWNh9Gs3oOgPc3S lloqPvAksi/4uJ7tQcOjmqhkj0IfQyhXZT/Iv3v05HFt0cQ8Q6xd7PlMyW2FwKysmn6M 5BDi0t20kT3tnqnL+Fme3kcVyfEFqDCeJFxF9jOg5oQbqqxITpk5F8GopUlRHNzoI7l0 tYaw== X-Gm-Message-State: ALoCoQmCi0R3bjN16wd0lXCZSMhG9gK1KmBWiN4fuZOw+d1gaHKNuQ35uBuna5wE2Wpz0ebj3kPu X-Received: by 10.112.54.166 with SMTP id k6mr3859860lbp.0.1437661994152; Thu, 23 Jul 2015 07:33:14 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.81 with SMTP id v17ls272617laz.2.gmail; Thu, 23 Jul 2015 07:33:14 -0700 (PDT) X-Received: by 10.112.255.68 with SMTP id ao4mr4801290lbd.96.1437661994005; Thu, 23 Jul 2015 07:33:14 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id cq12si4449169lad.97.2015.07.23.07.33.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jul 2015 07:33:13 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbbqi7 with SMTP id qi7so78672434lbb.3 for ; Thu, 23 Jul 2015 07:33:13 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr8333904lbb.36.1437661993780; Thu, 23 Jul 2015 07:33:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp591757lba; Thu, 23 Jul 2015 07:33:12 -0700 (PDT) X-Received: by 10.107.137.154 with SMTP id t26mr14250601ioi.13.1437661992024; Thu, 23 Jul 2015 07:33:12 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g2si4971380iog.99.2015.07.23.07.33.11; Thu, 23 Jul 2015 07:33:12 -0700 (PDT) Received-SPF: pass (google.com: domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CE7AA76217; Thu, 23 Jul 2015 14:33:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by mail.openembedded.org (Postfix) with ESMTP id DEE03761D8 for ; Thu, 23 Jul 2015 14:32:55 +0000 (UTC) Received: by lagw2 with SMTP id w2so158742367lag.3 for ; Thu, 23 Jul 2015 07:32:54 -0700 (PDT) X-Received: by 10.152.8.38 with SMTP id o6mr8425991laa.116.1437661974630; Thu, 23 Jul 2015 07:32:54 -0700 (PDT) Received: from chzi-linux.enea.se (sestofw01.enea.se. [192.36.1.252]) by smtp.googlemail.com with ESMTPSA id z1sm1060444lbj.11.2015.07.23.07.32.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Jul 2015 07:32:53 -0700 (PDT) From: =?UTF-8?q?Christian=20Zieth=C3=A9n?= To: openembedded-core@lists.openembedded.org Date: Thu, 23 Jul 2015 16:32:29 +0200 Message-Id: <1437661949-9295-2-git-send-email-christian.ziethen@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437661949-9295-1-git-send-email-christian.ziethen@linaro.org> References: <1437661949-9295-1-git-send-email-christian.ziethen@linaro.org> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/2] boot-directdisk: Make kernel image inclusion conditional. X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christian.ziethen@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 When building for qcow2 and a dummy kernel, avoid installing a non existing bzImage. Signed-off-by: Christian Ziethén --- meta/classes/boot-directdisk.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index d256fff..600e21a 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass @@ -70,7 +70,9 @@ boot_direct_populate() { install -d $dest # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. - install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage $dest/vmlinuz + if [ -e ${DEPLOY_DIR_IMAGE}/bzImage ]; then + install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage $dest/vmlinuz + fi # initrd is made of concatenation of multiple filesystem images if [ -n "${INITRD}" ]; then