From patchwork Wed Jun 3 06:11:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 49437 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 ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7F05520C3B for ; Wed, 3 Jun 2015 06:12:17 +0000 (UTC) Received: by wiam3 with SMTP id m3sf2382265wia.3 for ; Tue, 02 Jun 2015 23:12:16 -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:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=aJ1Lini1O7jrXIspahT3U184u2Pa0gviuky1Q1/JygA=; b=GWqZuKXXihBwMzQppLYSI6FBdyZtPVBz/pM9uutfN6QUdaXcXbftNoBeBnCr/J7a1B HVQQyEaJRfAjyHH+FKXdKdaPY3quvY7nPUe4k++VlhP96CJYmihiUAiMLjLafp+o7g70 HIXIL1Lw4trSrYDWf+FX726IT6fzVGRlwUrB79Fet4E1C/jyuY49SDtKIC5RugcUcUkJ XsfC/I1uRSvRjTaFwVWHy8cxHZc4GhDDpLG9NrGVELt9tQIWy9/nk26XUz9GJ/ITDbhX ytGtqwXaYhk8bs2YNrWoW5B2hBaXMB37WS4yuaWf3UksXyG0wy0t1KZO9ZPJc9O8ulkE 59tg== X-Gm-Message-State: ALoCoQkJHOGTk3WquUreJ+A/RPV9HT6hoIMPvljc2hhkVtCO8gdO35FlHpTXrgYUv7g2diPGrTT+ X-Received: by 10.112.118.162 with SMTP id kn2mr29528799lbb.22.1433311936638; Tue, 02 Jun 2015 23:12:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.162 with SMTP id g2ls889560lae.80.gmail; Tue, 02 Jun 2015 23:12:16 -0700 (PDT) X-Received: by 10.152.115.207 with SMTP id jq15mr22125857lab.119.1433311936493; Tue, 02 Jun 2015 23:12:16 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id lb2si17137858lbc.151.2015.06.02.23.12.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 23:12:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by labpy14 with SMTP id py14so76539lab.0 for ; Tue, 02 Jun 2015 23:12:16 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr20524801lac.41.1433311936222; Tue, 02 Jun 2015 23:12:16 -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.108.230 with SMTP id hn6csp3613914lbb; Tue, 2 Jun 2015 23:12:15 -0700 (PDT) X-Received: by 10.70.47.138 with SMTP id d10mr55833586pdn.137.1433311934291; Tue, 02 Jun 2015 23:12:14 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id di10si30053302pdb.34.2015.06.02.23.12.13; Tue, 02 Jun 2015 23:12:14 -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 2C52E756AA; Wed, 3 Jun 2015 06:12:05 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by mail.openembedded.org (Postfix) with ESMTP id 449A275681 for ; Wed, 3 Jun 2015 06:11:57 +0000 (UTC) Received: by wgv5 with SMTP id 5so64019wgv.1 for ; Tue, 02 Jun 2015 23:11:58 -0700 (PDT) X-Received: by 10.180.79.73 with SMTP id h9mr38073536wix.35.1433311918351; Tue, 02 Jun 2015 23:11:58 -0700 (PDT) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by mx.google.com with ESMTPSA id vz2sm20788305wjc.18.2015.06.02.23.11.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 23:11:57 -0700 (PDT) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Wed, 3 Jun 2015 08:11:54 +0200 Message-Id: <1433311914-15725-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Koen Kooi Subject: [OE-core] [PATCH] bootimg bbclass: don't hardcode 'bzImage' name 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: , MIME-Version: 1.0 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: koen.kooi@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.215.43 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 In the EFI case there are 2 more architectures besides x86(_64) that may use this class: aarch32, which tends to use 'zImage' and aarch64, which uses 'Image'. Instead of hardcoding those values like the luvOS fork does, use the proper variable. Signed-off-by: Koen Kooi --- meta/classes/bootimg.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index b1c03ba..d248321 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -47,6 +47,8 @@ EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}" EFI_PROVIDER ?= "grub-efi" EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" +KERNEL_IMAGETYPE ??= "bzImage" + # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not # contain "efi". This way legacy is supported by default if neither is # specified, maintaining the original behavior. @@ -66,8 +68,8 @@ populate() { DEST=$1 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 + # Install kernel, initrd, and rootfs.img in DEST for all loaders to use. + install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ${DEST}/vmlinuz # initrd is made of concatenation of multiple filesystem images if [ -n "${INITRD}" ]; then