From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.1842.1585622903567374867 for ; Mon, 30 Mar 2020 19:48:23 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: eric.dong@intel.com) IronPort-SDR: 87xt0AsJQx1j1OBy18wr9y6cK2upwb1bNXMBoSQSA1ycZcsOeiKVNclkhMFwYbo5FgHj2+aHqh YGO600/WJwTQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 19:48:22 -0700 IronPort-SDR: J0gSHEdMeCeC9+/hnl2PoaS8Q5fCpPrGDXmt+sK3ZtkpMXko/zYVHEqxwkji4cC0qHMfwR0Kiu 3jkrFcn5Zd8A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,326,1580803200"; d="scan'208,217";a="272589822" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga004.fm.intel.com with ESMTP; 30 Mar 2020 19:48:21 -0700 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 30 Mar 2020 19:48:21 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 30 Mar 2020 19:48:21 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.138]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.225]) with mapi id 14.03.0439.000; Tue, 31 Mar 2020 10:48:18 +0800 From: "Dong, Eric" To: "Luo, Heng" , "Ni, Ray" , "devel@edk2.groups.io" CC: "Bi, Dandan" , "Gao, Liming" Subject: Re: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to package path Thread-Topic: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to package path Thread-Index: AQHWBljpenB3Y54kjE+V8CXLh6Btn6hgUIkAgAETKQCAAJ0QMA== Date: Tue, 31 Mar 2020 02:48:17 +0000 Message-ID: References: <20200330060306.1695-1-heng.luo@intel.com> <20200330060306.1695-2-heng.luo@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C4CA684@SHSMSX104.ccr.corp.intel.com> <8AA0A44780D72D4CABD3ED3688D16E3E78FC766E@SHSMSX103.ccr.corp.intel.com> In-Reply-To: <8AA0A44780D72D4CABD3ED3688D16E3E78FC766E@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: eric.dong@intel.com Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_ED077930C258884BBCB450DB737E66225A01980Cshsmsx102ccrcor_" --_000_ED077930C258884BBCB450DB737E66225A01980Cshsmsx102ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Liming, Please help to provide comments for this mail. It break the open board now Thanks, Eric From: Luo, Heng Sent: Tuesday, March 31, 2020 9:25 AM To: Ni, Ray ; devel@edk2.groups.io Cc: Bi, Dandan ; Gao, Liming ; D= ong, Eric Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains = to package path Hi Liming, I will apply the change below if you agree to we treat a folder that conta= ins ".dec" and "dsc" files as a package directory: diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index b9ad980510..bb25699ed8 100644 --- a/Platform/Intel/build_bios.py +++ b/Platform/Intel/build_bios.py @@ -16,6 +16,7 @@ imported functions from board directory import os import re import sys +import glob import signal import shutil import argparse @@ -123,7 +124,10 @@ def pre_build(build_config, build_type=3D"DEBUG", sile= nt=3DFalse, toolchain=3DNone): # add all feature domains in WORKSPACE_FEATURES to package path for filename in os.listdir(config["WORKSPACE_FEATURES"]): filepath =3D os.path.join(config["WORKSPACE_FEATURES"], filename) - if os.path.isdir(filepath): + # feature domains folder does not contain dec or dsc file + if os.path.isdir(filepath) and \ + not glob.glob(os.path.join(filepath, "*.dec")) and \ + not glob.glob(os.path.join(filepath, "*.dsc")): config["PACKAGES_PATH"] +=3D os.pathsep + filepath config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_DRIVERS"] config["PACKAGES_PATH"] +=3D os.pathsep + \ Best Regards Heng > -----Original Message----- > From: Ni, Ray > > Sent: Monday, March 30, 2020 5:01 PM > To: Luo, Heng >; devel@edk2= .groups.io > Cc: Bi, Dandan >; Gao, Li= ming >; > Dong, Eric > > Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature domain= s to > package path > > > + # add all feature domains in WORKSPACE_FEATURES to package path > > + for filename in os.listdir(config["WORKSPACE_FEATURES"]): > > + filepath =3D os.path.join(config["WORKSPACE_FEATURES"], filena= me) > > + if os.path.isdir(filepath): > > + config["PACKAGES_PATH"] +=3D os.pathsep + filepath > > Will this change include "AdvancedFeaturePkg" and "TemplateFeaturePkg" > folder as well? > > Can you please revise the patch to skip adding folders that contains pack= age > contents to the PACKAGES_PATH? > > Liming, > What's the criteria of a package? Can we treat a folder that contains ".d= ec" > and "dsc" files as a package directory? > > Thanks, > Ray --_000_ED077930C258884BBCB450DB737E66225A01980Cshsmsx102ccrcor_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Liming,

 

Please help to provide comments for t= his mail. It break the open board now

 

Thanks,

Eric

From: Luo, Heng
Sent: Tuesday, March 31, 2020 9:25 AM
To: Ni, Ray <ray.ni@intel.com>; devel@edk2.groups.io
Cc: Bi, Dandan <dandan.bi@intel.com>; Gao, Liming <liming.g= ao@intel.com>; Dong, Eric <eric.dong@intel.com>
Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature d= omains to package path

 

Hi Liming,
I will apply the change&nbs= p;below if you agree to  we treat a=  folder that contains ".dec" and &q= uot;dsc" files as a package directory:=

diff --git a/Platform/Intel/build_bio= s.py b/Platform/Intel/build_bios.py
index b9ad980510..bb25699ed8 100644
--- a/Platform/Intel/build_bios.py<= br> +++ b/Platform/Intel/build_bio= s.py
@@ -16,6 +16,7 @@ impor= ted functions from board directory
 import os
 import re
 import sys
+import glob
 import signal
 import shutil
 import argparse
@@ -123,7 +124,10 @@ de= f pre_build(build_config, build_type=3D"DEBUG", si= lent=3DFalse, toolchain=3DNone):
     # add a= ll feature domains in WORKSPACE_FEATURES to p= ackage path
     for filename=  in os.listdir(config["WORKSPACE_FEATURES"]):         = ; filepath =3D os.path.join(config["WORKSPACE_FEATURES&= quot;], filename)
-       &nbs= p;if os.path.isdir(filepath):
+       =  # feature domains folder does not conta= in dec or dsc file
+       =  if os.path.isdir(filepath) and \
+       =    not glob.glob(os.path.join(filepath, "*.de= c")) and \
+       =    not glob.glob(os.path.join(filepath, "*.ds= c")):
        = ;     config["PACKAGES_PATH"] += =3D os.pathsep + filepath
     config["PACK= AGES_PATH"] +=3D os.pathsep + config["= ;WORKSPACE_DRIVERS"]
     config["PACK= AGES_PATH"] +=3D os.pathsep + \

Best Regards
Heng

> -----Original Message-----
> From: Ni, Ray <ray.ni@intel.com>
> Sent: Monday, March 3= 0, 2020 5:01 PM
> To: Luo, Heng <heng.luo@intel.com>; devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Gao,=  Liming <liming.gao@in= tel.com>;
> Dong, Eric <eric.dong@intel.com>
> Subject: RE: [PATCH 1= /3] Platform/Intel: Add all pathes of feature=  domains to
> package path
> 
> > +    = ;# add all feature domains in WORKSPACE_FEATU= RES to package path
> > +    = ;for filename in os.listdir(config["WORKSPACE_FEATURES&= quot;]):
> > +    = ;    filepath =3D os.path.join(config["W= ORKSPACE_FEATURES"], filename)
> > +    = ;    if os.path.isdir(filepath):
> > +    = ;        config["PACKAGES_PATH= "] +=3D os.pathsep + filepath
> 
> Will this change incl= ude "AdvancedFeaturePkg" and "TemplateFeature= Pkg"
> folder as well?
> 
> Can you please revise=  the patch to skip adding folders that&n= bsp;contains package
> contents to the PACKA= GES_PATH?
> 
> Liming,
> What's the criteria o= f a package? Can we treat a folder = that contains ".dec"
> and "dsc" files&= nbsp;as a package directory?
> 
> Thanks,
> Ray

--_000_ED077930C258884BBCB450DB737E66225A01980Cshsmsx102ccrcor_--