1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup not executed

Leif Lindholm posted 1 patch 4 years, 9 months ago
Failed in applying to current master (apply log)
BaseTools/Source/C/FCE/GNUmakefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup not executed
Posted by Leif Lindholm 4 years, 9 months ago 
Commit 3c59d94637ad ("BaseTools/FCE: Add a tool FCE") added a new tool
that is always built. Pre-existing tools locate the makefile includes
with relative paths, but FCE uses EDK_TOOLS_PATH, adding a new dependency
on having sourced edksetup.sh before building BaseTools.

Change FCE GNUmakefile to match other tools.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---

This broke our CI setup, so I'd appreciate if it could be merged quickly.

 BaseTools/Source/C/FCE/GNUmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/C/FCE/GNUmakefile b/BaseTools/Source/C/FCE/GNUmakefile
index 3e1b6a85e2..7a7e1ef4b8 100644
--- a/BaseTools/Source/C/FCE/GNUmakefile
+++ b/BaseTools/Source/C/FCE/GNUmakefile
@@ -42,7 +42,7 @@ endif
 export ARCH
 export HOST_ARCH=$(ARCH)
 
-MAKEROOT ?= $(EDK_TOOLS_PATH)/Source/C
+MAKEROOT ?= ..
 
 APPNAME = FCE
 
-- 
2.11.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#43348): https://edk2.groups.io/g/devel/message/43348
Mute This Topic: https://groups.io/mt/32316137/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup not executed
Posted by Hiber He 4 years, 9 months ago 
Hi,


    I think the license of FCE is not correct(Should be BSD-2-Clause-Patent). And the logic for ARCH("ifndef ARCH") can be deleted.


   I deleted the ARCH related lines and it did built. 


Best Regards,
Hiber


      


On 07/05/2019 18:34, Leif Lindholm wrote:
Commit 3c59d94637ad ("BaseTools/FCE: Add a tool FCE") added a new tool
that is always built. Pre-existing tools locate the makefile includes
with relative paths, but FCE uses EDK_TOOLS_PATH, adding a new dependency
on having sourced edksetup.sh before building BaseTools.

Change FCE GNUmakefile to match other tools.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---

This broke our CI setup, so I'd appreciate if it could be merged quickly.

BaseTools/Source/C/FCE/GNUmakefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/C/FCE/GNUmakefile b/BaseTools/Source/C/FCE/GNUmakefile
index 3e1b6a85e2..7a7e1ef4b8 100644
--- a/BaseTools/Source/C/FCE/GNUmakefile
+++ b/BaseTools/Source/C/FCE/GNUmakefile
@@ -42,7 +42,7 @@ endif
export ARCH
export HOST_ARCH=$(ARCH)

-MAKEROOT ?= $(EDK_TOOLS_PATH)/Source/C
+MAKEROOT ?= ..

APPNAME = FCE

--
2.11.0




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#43350): https://edk2.groups.io/g/devel/message/43350
Mute This Topic: https://groups.io/mt/32316137/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup not executed
Posted by Liming Gao 4 years, 9 months ago 
Thanks for your catch. Yes. This is an issue. I will send the patch to clean it.

For this patch, the change is good. Reviewed-by: Liming Gao <liming.gao@intel.com>

From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Hiber He
Sent: Friday, July 5, 2019 7:26 PM
To: devel <devel@edk2.groups.io>; leif.lindholm <leif.lindholm@linaro.org>
Subject: Re: [edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup not executed

Hi,

    I think the license of FCE is not correct(Should be BSD-2-Clause-Patent). And the logic for ARCH("ifndef ARCH") can be deleted.

   I deleted the ARCH related lines and it did built.

Best Regards,
Hiber



On 07/05/2019 18:34, Leif Lindholm<mailto:leif.lindholm@linaro.org> wrote:
Commit 3c59d94637ad ("BaseTools/FCE: Add a tool FCE") added a new tool
that is always built. Pre-existing tools locate the makefile includes
with relative paths, but FCE uses EDK_TOOLS_PATH, adding a new dependency
on having sourced edksetup.sh before building BaseTools.

Change FCE GNUmakefile to match other tools.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org<mailto:leif.lindholm@linaro.org>>
---

This broke our CI setup, so I'd appreciate if it could be merged quickly.

BaseTools/Source/C/FCE/GNUmakefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/C/FCE/GNUmakefile b/BaseTools/Source/C/FCE/GNUmakefile
index 3e1b6a85e2..7a7e1ef4b8 100644
--- a/BaseTools/Source/C/FCE/GNUmakefile
+++ b/BaseTools/Source/C/FCE/GNUmakefile
@@ -42,7 +42,7 @@ endif
export ARCH
export HOST_ARCH=$(ARCH)

-MAKEROOT ?= $(EDK_TOOLS_PATH)/Source/C
+MAKEROOT ?= ..

APPNAME = FCE

--
2.11.0




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#43356): https://edk2.groups.io/g/devel/message/43356
Mute This Topic: https://groups.io/mt/32316137/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup not executed
Posted by Leif Lindholm 4 years, 9 months ago 
On Fri, Jul 05, 2019 at 01:41:54PM +0000, Gao, Liming wrote:
> Thanks for your catch. Yes. This is an issue. I will send the patch to clean it.
> 
> For this patch, the change is good. Reviewed-by: Liming Gao <liming.gao@intel.com>

Thanks!
Pushed as d031fc07eb83.

/
    Leif

> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Hiber He
> Sent: Friday, July 5, 2019 7:26 PM
> To: devel <devel@edk2.groups.io>; leif.lindholm <leif.lindholm@linaro.org>
> Subject: Re: [edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup not executed
> 
> Hi,
> 
>     I think the license of FCE is not correct(Should be BSD-2-Clause-Patent). And the logic for ARCH("ifndef ARCH") can be deleted.
> 
>    I deleted the ARCH related lines and it did built.
> 
> Best Regards,
> Hiber
> 
> 
> 
> On 07/05/2019 18:34, Leif Lindholm<mailto:leif.lindholm@linaro.org> wrote:
> Commit 3c59d94637ad ("BaseTools/FCE: Add a tool FCE") added a new tool
> that is always built. Pre-existing tools locate the makefile includes
> with relative paths, but FCE uses EDK_TOOLS_PATH, adding a new dependency
> on having sourced edksetup.sh before building BaseTools.
> 
> Change FCE GNUmakefile to match other tools.
> 
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org<mailto:leif.lindholm@linaro.org>>
> ---
> 
> This broke our CI setup, so I'd appreciate if it could be merged quickly.
> 
> BaseTools/Source/C/FCE/GNUmakefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/C/FCE/GNUmakefile b/BaseTools/Source/C/FCE/GNUmakefile
> index 3e1b6a85e2..7a7e1ef4b8 100644
> --- a/BaseTools/Source/C/FCE/GNUmakefile
> +++ b/BaseTools/Source/C/FCE/GNUmakefile
> @@ -42,7 +42,7 @@ endif
> export ARCH
> export HOST_ARCH=$(ARCH)
> 
> -MAKEROOT ?= $(EDK_TOOLS_PATH)/Source/C
> +MAKEROOT ?= ..
> 
> APPNAME = FCE
> 
> --
> 2.11.0
> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#43358): https://edk2.groups.io/g/devel/message/43358
Mute This Topic: https://groups.io/mt/32316137/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.