From patchwork Fri Oct 19 04:51:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 149208 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2845665lji; Thu, 18 Oct 2018 21:51:44 -0700 (PDT) X-Google-Smtp-Source: ACcGV60c23MYRrETvqWHUcMjv9Z0DABp20inpYXyI2EWePbD4Q9CpRMfNu/l9YuoPTEsVqUrG8lS X-Received: by 2002:aed:2722:: with SMTP id n31-v6mr32506322qtd.304.1539924704434; Thu, 18 Oct 2018 21:51:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539924704; cv=none; d=google.com; s=arc-20160816; b=Crs4eFz3cdkk7kOpeTxfcqPP0M5RiSp0dqNX7HOLafiQUT7lqkKZ8+QEvvvqJDtrJx 1GGAUas6y98VhjFA0AcSBiqxtOOH1lAHC55N+hSt6eVqc2a2rNeVv8sSvMSj0mM3rndJ kv3HTTObcg2k9JqW1UFwC00ZPgratQ9cK+60wAbKNvlhFascFk7zS2WeeO/dEoBHaLoq cblCbARXBSTBXM3l2v9a+U3agshRKzwhaMF/6MMYsenVyfQTxeOKoBgJStnP8rJm5qLQ 2Sm+XeIECVvTjOiQy5D+wsaqcvvTkXXXnJEIXUatFyF2kQyM5cfydgrOJLDGRkC+e73s yOJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=94+9JO4iXLbEr35kapcHRUn2sQD8z4Zrgzp1/kQPfr0=; b=s72Hp6tjGnDbiqZ+TOj/yrHH5l/7WAzansMbtedq0qc5vCKXEuzN0kxPlggkgsdqq1 JsxVvjpfB1bJYJ5mc67AKBbm6Uj6WRCXGBjbS+qnN2N2pk/dE1LkR+K/7ac1tlC6HAM2 Km+3ex335T2k9H3KOeMHb4GEWVPLsTSevbZ1LzbED8V+6j1NCtJglpd+bjdZIIRT/JwC 63rpIt3Kiw3qQ+MgeVU8cOKu0kZWTAzXQzqk9xhdzuxk5zzzaBoN+q1MSCvTQ+1PeLCh vvaWdyo4qquizYuJyRAZsJEsxgntaNgT4Aw5+hk0dMWEJETjrOCYd+yGGHoMeEHM4GU8 9nWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id h11si12184889qvo.125.2018.10.18.21.51.44; Thu, 18 Oct 2018 21:51:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0AA0668674; Fri, 19 Oct 2018 04:51:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 2CBA36866F; Fri, 19 Oct 2018 04:51:40 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D01F768674; Fri, 19 Oct 2018 04:51:38 +0000 (UTC) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by lists.linaro.org (Postfix) with ESMTPS id B91E168672 for ; Fri, 19 Oct 2018 04:51:28 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id f18-v6so15332931plr.1 for ; Thu, 18 Oct 2018 21:51:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9fY0WYf5bA/wB5JT/KTGke7r0EqvspwUkRw6cyN1Yco=; b=r/Xmnf9YW/It4bpmFdXHa9uRob3TO+wryKHQbPKDpDgzE3QKkjd2tZc1dXFo4cVuzC an/pn+X8fuOL/QkJEdq5/VXgyfmImYnsA2Ba9JwdQZnpKgmL4XjZEUuB9uuEECGeu/qZ ZLNBY5ncbJP7PKHjdOB19yQpWsbahk6j4pRHgERr9v1Uk9f9ufeQZreFwUZyu88XNLdA dwffyaHgkGodX3RqGIgKkJ2YqG172CDn7e1ZLrIns8cchvWUJSK/z+etNcoDrS1GglIy Q+Q+lyX/R1oJFeW/pnocnd2HPCkLDWRmZIdK/FucDkMiwHHMEWCG6gCUp7Hef0qHgsqB iMlA== X-Gm-Message-State: ABuFfoh8oYNPRqoQ/zJCYqq4Iyzib2IQYoiyfkL4NBcOP2iKMw5xHGG4 QhdIIe2T1w6l/+IT1HYWDq9CCUXMJr8w4eGz X-Received: by 2002:a17:902:8eca:: with SMTP id x10-v6mr32594848plo.336.1539924687672; Thu, 18 Oct 2018 21:51:27 -0700 (PDT) Received: from localhost.localdomain ([64.64.108.108]) by smtp.gmail.com with ESMTPSA id n17-v6sm29198300pfj.84.2018.10.18.21.51.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Oct 2018 21:51:26 -0700 (PDT) From: Haojian Zhuang To: linaro-uefi@lists.linaro.org, leif.lindholm@linaro.org, ard.biesheuvel@linaro.org Date: Fri, 19 Oct 2018 12:51:14 +0800 Message-Id: <1539924674-32586-2-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539924674-32586-1-git-send-email-haojian.zhuang@linaro.org> References: <1539924674-32586-1-git-send-email-haojian.zhuang@linaro.org> Subject: [Linaro-uefi] [PATCH v2 1/1] atf-build.sh: fix to calculate atf version X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" commit 1a0f11213a539a5d0c5d05bfaa68ccc75cb340aa Author: Soby Mathew Date: Mon Oct 1 16:16:34 2018 +0100 Update the version to 2.0 Change-Id: Icbc556d47a58d0870577b1bf1cd27cc5827fd56d Signed-off-by: Soby Mathew Since ARM Trusted Firmware version is updated to 2.0, the calculation of ATF is wrong. It could only calculate version for 1.x. Update the calculation to support 2.x or n.x. Signed-off-by: Haojian Zhuang Reviewed-by: Leif Lindholm --- atf-build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/atf-build.sh b/atf-build.sh index fb80ad0..30af714 100755 --- a/atf-build.sh +++ b/atf-build.sh @@ -27,7 +27,11 @@ function check_atf_buildver MINOR=`grep "^VERSION_MINOR" Makefile | sed 's/.*:= *\([0-9]*\).*/\1/'` [ $? -ne 0 ] && return 1 - if [ "$MAJOR" -eq 1 -a "$MINOR" -ge 2 ]; then + if [ "$MAJOR" -eq 1 ]; then + if [ "$MINOR" -ge 2 ]; then + ATF_BUILDVER=2 + fi + else ATF_BUILDVER=2 fi }