From patchwork Tue Sep 13 04:02:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 12687 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 787D3C6FA92 for ; Tue, 13 Sep 2022 04:02:56 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.897.1663041770264287170 for ; Mon, 12 Sep 2022 21:02:50 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id DCAA840D8D for ; Tue, 13 Sep 2022 04:02:48 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ecc_dOghV8sj for ; Tue, 13 Sep 2022 04:02:48 +0000 (UTC) Received: from mail.denix.org (pool-100-15-80-88.washdc.fios.verizon.net [100.15.80.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id D2BC240D8C for ; Tue, 13 Sep 2022 04:02:47 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 701BA1749DA for ; Tue, 13 Sep 2022 00:02:46 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 33/52] tisdk-bundle: fix prebuilt-images U-Boot binary name for HS Date: Tue, 13 Sep 2022 04:02:27 +0000 Message-Id: <20220913040246.2365077-34-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220913040246.2365077-1-denis@denix.org> References: <20220913040246.2365077-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 04:02:56 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14016 From: Andrew Davis HS builds do not generate a -${MACHINE} version of the u-boot.img binary. Not sure why we deploy these named this way to begin with, maybe a left- over from when we had multiple machines per SDK.. To fix the HS builds lets ship the binary named as-is for all platforms. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-arago-distro/classes/tisdk-bundle.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass index 5ab9f875..a3c5ee11 100644 --- a/meta-arago-distro/classes/tisdk-bundle.bbclass +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass @@ -771,9 +771,9 @@ tisdk_image_build () { fi # Copy the U-Boot image if it exists - if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ] + if [ -e ${DEPLOY_DIR_IMAGE}/u-boot.img ] then - cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ${prebuilt_dir}/ + cp ${DEPLOY_DIR_IMAGE}/u-boot.img ${prebuilt_dir}/ elif [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ] then cp ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ${prebuilt_dir}/