From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=bob.c.feng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B9B032119BBFA for ; Tue, 18 Dec 2018 16:25:32 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Dec 2018 16:25:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,370,1539673200"; d="scan'208";a="127155328" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga002.fm.intel.com with ESMTP; 18 Dec 2018 16:25:32 -0800 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 18 Dec 2018 16:25:31 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 18 Dec 2018 16:25:31 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.201]) by shsmsx102.ccr.corp.intel.com ([169.254.2.182]) with mapi id 14.03.0415.000; Wed, 19 Dec 2018 08:25:29 +0800 From: "Feng, Bob C" To: "Lin, Derek (HPS SW)" , "edk2-devel@lists.01.org" , "Zhao, ZhiqiangX" Thread-Topic: [PATCH] BaseTools: Fix GenFds error doesn't break build. Thread-Index: AQHUlq6uy5KIEx9u0kSsDzJ8WgMcBaWEMBNQgAEElKA= Date: Wed, 19 Dec 2018 00:25:29 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D160030829@SHSMSX101.ccr.corp.intel.com> References: <20181218084936.2472-1-derek.lin2@hpe.com> In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] BaseTools: Fix GenFds error doesn't break build. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Dec 2018 00:25:32 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Derek, This patch looks good to me. But I failed to apply this patch on master. Co= uld you update this patch? Thanks, Bob -----Original Message----- From: Lin, Derek (HPS SW) [mailto:derek.lin2@hpe.com]=20 Sent: Tuesday, December 18, 2018 4:52 PM To: edk2-devel@lists.01.org; Feng, Bob C ; Zhao, Zhiq= iangX Cc: Lin, Derek (HPS SW) Subject: [PATCH] BaseTools: Fix GenFds error doesn't break build. Fix a bug because of b3497bad1221704a5dbc5da0b10f42625f1ad2ed. Before the patch, when GenFds fail, the build continue and return success. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Derek Lin --- BaseTools/Source/Python/build/build.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index cbbb291b2c..97271e634e 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -3,6 +3,7 @@ # # Copyright (c) 2014, Hewlett-Packard Development Company, L.P.
# C= opyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.
# # This program and the accompanying materials # are licensed and made a= vailable under the terms and conditions of the BSD License @@ -1384,7 +1385= ,8 @@ class Build(): =20 # genfds if Target =3D=3D 'fds': - GenFdsApi(AutoGenObject.GenFdsCommandDict, self.Db) + if GenFdsApi(AutoGenObject.GenFdsCommandDict, self.Db): + EdkLogger.error("build", COMMAND_FAILURE) return True =20 # run @@ -2122,7 +2124,8 @@ class Build(): # Generate FD image if there's a FDF file found # GenFdsStart =3D time.time() - GenFdsApi(Wa.GenFdsCommandDict, self.Db) + if GenFdsApi(Wa.GenFdsCommandDict, self.Db): + EdkLogger.error("build", COMMAND_FAILURE) =20 # # Create MAP file for all platform FVs after GenFd= s. -- 2.17.0.windows.1