* [PATCH] BaseTools: Fix GenFds error doesn't break build.
[not found] <20181218084936.2472-1-derek.lin2@hpe.com>
@ 2018-12-18 8:51 ` Lin, Derek (HPS SW)
2018-12-19 0:25 ` Feng, Bob C
0 siblings, 1 reply; 4+ messages in thread
From: Lin, Derek (HPS SW) @ 2018-12-18 8:51 UTC (permalink / raw)
To: edk2-devel@lists.01.org, bob.c.feng@intel.com,
zhiqiangx.zhao@intel.com
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] BaseTools: Fix GenFds error doesn't break build.
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)
0 siblings, 1 reply; 4+ messages in thread
From: Feng, Bob C @ 2018-12-19 0:25 UTC (permalink / raw)
To: Lin, Derek (HPS SW), edk2-devel@lists.01.org, Zhao, ZhiqiangX
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] BaseTools: Fix GenFds error doesn't break build.
2018-12-19 0:25 ` Feng, Bob C
@ 2018-12-19 1:55 ` Lin, Derek (HPS SW)
2018-12-19 1:58 ` Feng, Bob C
0 siblings, 1 reply; 4+ messages in thread
From: Lin, Derek (HPS SW) @ 2018-12-19 1:55 UTC (permalink / raw)
To: Feng, Bob C, edk2-devel@lists.01.org, Zhao, ZhiqiangX
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] BaseTools: Fix GenFds error doesn't break build.
2018-12-19 1:55 ` Lin, Derek (HPS SW)
@ 2018-12-19 1:58 ` Feng, Bob C
0 siblings, 0 replies; 4+ messages in thread
From: Feng, Bob C @ 2018-12-19 1:58 UTC (permalink / raw)
To: Lin, Derek (HPS SW), edk2-devel@lists.01.org, Zhao, ZhiqiangX
Thanks. This patch works.
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Thanks,
Bob
-----Original Message-----
From: Lin, Derek (HPS SW) [mailto:derek.lin2@hpe.com]
Sent: Wednesday, December 19, 2018 9:55 AM
To: Feng, Bob C <bob.c.feng@intel.com>; edk2-devel@lists.01.org; Zhao, ZhiqiangX <zhiqiangx.zhao@intel.com>
Subject: RE: [PATCH] BaseTools: Fix GenFds error doesn't break build.
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-19 1:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[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)
2018-12-19 1:58 ` Feng, Bob C
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox