Hi Bob, Please try attached patch. Based on today's master.
Thanks, Derek -----Original Message----- From: Feng, Bob C [mailto:bob.c.f...@intel.com] Sent: Wednesday, December 19, 2018 8:25 AM To: Lin, Derek (HPS SW) <derek.l...@hpe.com>; edk2-devel@lists.01.org; Zhao, ZhiqiangX <zhiqiangx.z...@intel.com> Subject: RE: [PATCH] BaseTools: Fix GenFds error doesn't break build. Hi Derek, This patch looks good to me. But I failed to apply this patch on master. Could you update this patch? Thanks, Bob -----Original Message----- From: Lin, Derek (HPS SW) [mailto:derek.l...@hpe.com] Sent: Tuesday, December 18, 2018 4:52 PM To: edk2-devel@lists.01.org; Feng, Bob C <bob.c.f...@intel.com>; Zhao, ZhiqiangX <zhiqiangx.z...@intel.com> Cc: Lin, Derek (HPS SW) <derek.l...@hpe.com> 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 <derek.l...@hpe.com> --- 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/Python/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.<BR> # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<BR> # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -1384,7 +1385,8 @@ class Build(): # genfds if Target == 'fds': - GenFdsApi(AutoGenObject.GenFdsCommandDict, self.Db) + if GenFdsApi(AutoGenObject.GenFdsCommandDict, self.Db): + EdkLogger.error("build", COMMAND_FAILURE) return True # run @@ -2122,7 +2124,8 @@ class Build(): # Generate FD image if there's a FDF file found # GenFdsStart = time.time() - GenFdsApi(Wa.GenFdsCommandDict, self.Db) + if GenFdsApi(Wa.GenFdsCommandDict, self.Db): + EdkLogger.error("build", COMMAND_FAILURE) # # Create MAP file for all platform FVs after GenFds. -- 2.17.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
