public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Lin, Derek (HPS SW)" <derek.lin2@hpe.com>
To: "Feng, Bob C" <bob.c.feng@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>,
	"Zhao, ZhiqiangX" <zhiqiangx.zhao@intel.com>
Subject: Re: [PATCH] BaseTools: Fix GenFds error doesn't break build.
Date: Wed, 19 Dec 2018 01:55:22 +0000	[thread overview]
Message-ID: <TU4PR8401MB06567FA73742214AA710C448C2BE0@TU4PR8401MB0656.NAMPRD84.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <08650203BA1BD64D8AD9B6D5D74A85D160030829@SHSMSX101.ccr.corp.intel.com>

Hi Bob, 

Please try attached patch. Based on today's master.

Thanks,
Derek


-----Original Message-----
From: Feng, Bob C [mailto:bob.c.feng@intel.com] 
Sent: Wednesday, December 19, 2018 8:25 AM
To: Lin, Derek (HPS SW) <derek.lin2@hpe.com>; edk2-devel@lists.01.org; Zhao, ZhiqiangX <zhiqiangx.zhao@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.lin2@hpe.com] 
Sent: Tuesday, December 18, 2018 4:52 PM
To: edk2-devel@lists.01.org; Feng, Bob C <bob.c.feng@intel.com>; Zhao, ZhiqiangX <zhiqiangx.zhao@intel.com>
Cc: Lin, Derek (HPS SW) <derek.lin2@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.lin2@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




  reply	other threads:[~2018-12-19  1:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20181218084936.2472-1-derek.lin2@hpe.com>
2018-12-18  8:51 ` [PATCH] BaseTools: Fix GenFds error doesn't break build Lin, Derek (HPS SW)
2018-12-19  0:25   ` Feng, Bob C
2018-12-19  1:55     ` Lin, Derek (HPS SW) [this message]
2018-12-19  1:58       ` Feng, Bob C

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=TU4PR8401MB06567FA73742214AA710C448C2BE0@TU4PR8401MB0656.NAMPRD84.PROD.OUTLOOK.COM \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox