From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=148.163.147.86; helo=mx0a-002e3701.pphosted.com; envelope-from=derek.lin2@hpe.com; receiver=edk2-devel@lists.01.org Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) (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 3E19C21198CCC for ; Tue, 18 Dec 2018 00:51:54 -0800 (PST) Received: from pps.filterd (m0148663.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id wBI8jiSm008474 for ; Tue, 18 Dec 2018 08:51:54 GMT Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0a-002e3701.pphosted.com with ESMTP id 2peuph0y47-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 18 Dec 2018 08:51:53 +0000 Received: from G1W8108.americas.hpqcorp.net (g1w8108.austin.hp.com [16.193.72.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g2t2353.austin.hpe.com (Postfix) with ESMTPS id EE1F68F for ; Tue, 18 Dec 2018 08:51:52 +0000 (UTC) Received: from G4W9119.americas.hpqcorp.net (2002:10d2:14d6::10d2:14d6) by G1W8108.americas.hpqcorp.net (2002:10c1:483c::10c1:483c) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 18 Dec 2018 08:51:52 +0000 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (15.241.52.13) by G4W9119.americas.hpqcorp.net (16.210.20.214) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Tue, 18 Dec 2018 08:51:52 +0000 Received: from TU4PR8401MB0656.NAMPRD84.PROD.OUTLOOK.COM (10.169.44.150) by TU4PR8401MB0671.NAMPRD84.PROD.OUTLOOK.COM (10.169.45.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.20; Tue, 18 Dec 2018 08:51:50 +0000 Received: from TU4PR8401MB0656.NAMPRD84.PROD.OUTLOOK.COM ([fe80::c5fd:216a:9df4:1a9]) by TU4PR8401MB0656.NAMPRD84.PROD.OUTLOOK.COM ([fe80::c5fd:216a:9df4:1a9%4]) with mapi id 15.20.1425.023; Tue, 18 Dec 2018 08:51:49 +0000 From: "Lin, Derek (HPS SW)" To: "edk2-devel@lists.01.org" , "bob.c.feng@intel.com" , "zhiqiangx.zhao@intel.com" Thread-Topic: [PATCH] BaseTools: Fix GenFds error doesn't break build. Thread-Index: AQHUlq6uy5KIEx9u0kSsDzJ8WgMcBaWEMBNQ Date: Tue, 18 Dec 2018 08:51:49 +0000 Message-ID: References: <20181218084936.2472-1-derek.lin2@hpe.com> In-Reply-To: <20181218084936.2472-1-derek.lin2@hpe.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [16.242.247.138] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; TU4PR8401MB0671; 6:stm5nfaKvySe4ZSOqVs+iRnNTKsNsqSPxXVShR4N3icaUMm7EgMmE6xXrYK7vGZ7k/rOGuv+XJwF6woPkMxD4ATEd7Rf+XpqHlv7wR3xo9IxgCGH5NU228Qoutv1aFu7FDqFy+GHbDhfycAfr96mozxFjRjVcUYTJptL9QjbUPVKnBd3JtVaUhGuqZvLxF/ogBxnF3ThfFT9PXGJj2EP3pyD0whPujpl4w1vo0J3SPWm3r2n3NR/om8v05iimxZIFD6qlg8+4BexwgUjXdnok1rgdBHASftKR3iAdH96R4Qi1pb8crgsfp2fu0VKrwnXdlFiDvBSLriCFOhXMZqnpfW9j5ncZvINU/8jejAmFTFLs/L9iUDuA6fvVqveDBB1uPE37+7iKn/v0wZzNEBIvMaYCebUak23FU6j8/vAuGswRBqggQx4XjmpNdijDa0kDLhLgIv8X+4fsoFOxTWLcA==; 5:ERQTaaQU16OgjOn/C+ffh1o/GRLDKkye/w42/ML1AYsSxkAVfT2SptXx1yAEIDWpFF+0+wEsShvzIhR3fqk5Q2ufjfouZo/b3AfdEO7V6XAsXNujveE437b/zg8kj/0dqXUfm0kq8qkFa/SqN4EdUj/jUQNIxGPG6FDLnjxBxnk=; 7:vPlZb9VEq5Wlt2bVDi0fMsuwYVgfqA+0+KZKWGac8j7l998MxtE2rQrEeBpEDwU6JkThT6ifD5BskjpBP80ZeTKwLg5W6J5/69slH2c3J2olvRAZE/86JlACZdVSnJAT7nDcA+l8UvN9HQp9M9w8dA== x-ms-exchange-antispam-srfa-diagnostics: SOS;SOR; x-forefront-antispam-report: SFV:SKI; SCL:-1; SFV:NSPM; SFS:(10019020)(396003)(366004)(39860400002)(346002)(376002)(136003)(189003)(199004)(6506007)(97736004)(106356001)(105586002)(3846002)(6436002)(6116002)(8936002)(71200400001)(486006)(71190400001)(14454004)(68736007)(66066001)(305945005)(478600001)(74316002)(11346002)(476003)(4326008)(25786009)(2906002)(2501003)(7696005)(446003)(76176011)(186003)(7736002)(316002)(55016002)(110136005)(26005)(86362001)(99286004)(8676002)(575784001)(2201001)(81156014)(81166006)(9686003)(102836004)(5660300001)(14444005)(53936002)(256004)(33656002); DIR:OUT; SFP:1102; SCL:1; SRVR:TU4PR8401MB0671; H:TU4PR8401MB0656.NAMPRD84.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-office365-filtering-correlation-id: e21ff676-bb8f-436a-2c09-08d664c60c55 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TU4PR8401MB0671; x-ms-traffictypediagnostic: TU4PR8401MB0671: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231475)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:TU4PR8401MB0671; BCL:0; PCL:0; RULEID:; SRVR:TU4PR8401MB0671; x-forefront-prvs: 08902E536D received-spf: None (protection.outlook.com: hpe.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: MjLjS7tA2ADPuE2qTgC4jHsD83L/3JsrHu/QeD8TBm3D0Pz7CYfm2PP3p903xQ3NsD8L8yvEQuAplSxTY0t27uh0yhRzQOxxuvS51VqiF2W+ARM9VwR5xTeThsVXZwBCRU7Vmid0IKRQWS+rIoNP+/vBIzHXFzpi5zTcdbvezQTH12GgGxxcpo7dQY0lHTiRmixgGxaVkZKe8akCzyGFEVBtnmElElbt1lxuRc60d/IsbnsVqum48TzF3OaougblK/LHiHmKoit4knzF8DHn77ZXX792ljfSka2Kps3BjoZwu/ZLbbqUBAwwPJG6jX96 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: e21ff676-bb8f-436a-2c09-08d664c60c55 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Dec 2018 08:51:49.2124 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-Transport-CrossTenantHeadersStamped: TU4PR8401MB0671 X-OriginatorOrg: hpe.com X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-12-18_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=689 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1812180079 Subject: [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: Tue, 18 Dec 2018 08:51:55 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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