From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: liming.gao@intel.com) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Fri, 05 Jul 2019 06:41:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jul 2019 06:41:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,455,1557212400"; d="scan'208,217";a="339838472" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga005.jf.intel.com with ESMTP; 05 Jul 2019 06:41:56 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 5 Jul 2019 06:41:55 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.110]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.55]) with mapi id 14.03.0439.000; Fri, 5 Jul 2019 21:41:54 +0800 From: "Liming Gao" To: "devel@edk2.groups.io" , "hiberhe@163.com" , leif.lindholm Subject: Re: [edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup not executed Thread-Topic: [edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup not executed Thread-Index: AQHVMx1BXorlneAQWkyynh0SUZFcFKa7XJ0AgACroTA= Date: Fri, 5 Jul 2019 13:41:54 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4A3007@SHSMSX104.ccr.corp.intel.com> References: <20190705103426.1423-1-leif.lindholm@linaro.org> <78ad489c.74f6.16bc1e2a34f.Coremail.hiberhe@163.com> In-Reply-To: <78ad489c.74f6.16bc1e2a34f.Coremail.hiberhe@163.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMTdlNGRmYzgtYWE2Ny00NWMzLTk0ZDgtNmEyZjVkMTY1Y2ZhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoidTRTNEpKdHNGclpJQndOckFCZGZmeUZtNVRURzJrdGg3OHJTNUFRdUMydjRLdlI5d1lOeStYaGhIM1puQ09QRyJ9 dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_4A89E2EF3DFEDB4C8BFDE51014F606A14E4A3007SHSMSX104ccrcor_" --_000_4A89E2EF3DFEDB4C8BFDE51014F606A14E4A3007SHSMSX104ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks for your catch. Yes. This is an issue. I will send the patch to clea= n it. For this patch, the change is good. Reviewed-by: Liming Gao From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Hibe= r He Sent: Friday, July 5, 2019 7:26 PM To: devel ; leif.lindholm Subject: Re: [edk2-devel] [PATCH] BaseTools: fix FCE build when edksetup n= ot executed Hi, I think the license of FCE is not correct(Should be BSD-2-Clause-Paten= t). 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 > --- 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/G= NUmakefile 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=3D$(ARCH) -MAKEROOT ?=3D $(EDK_TOOLS_PATH)/Source/C +MAKEROOT ?=3D .. APPNAME =3D FCE -- 2.11.0 --_000_4A89E2EF3DFEDB4C8BFDE51014F606A14E4A3007SHSMSX104ccrcor_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Thanks for your catch= . Yes. This is an issue. I will send the patch to clean it.

 

For this patch, the c= hange 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.lind= holm@linaro.org>
Subject: Re: [edk2-devel] [PATCH] BaseTools: fix FCE build when edk= setup not executed

 

Hi,

 

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

 

   I deleted the ARCH related lines a= nd it did built. 

 

Best Regards,

Hiber

 

      

 

On 07/05/2019 18:34, Leif Lindholm wrot= e:

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/G= NUmakefile
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=3D$(ARCH)

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

APPNAME =3D FCE

--
2.11.0


--_000_4A89E2EF3DFEDB4C8BFDE51014F606A14E4A3007SHSMSX104ccrcor_--