From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.1899.1585623151693752271 for ; Mon, 30 Mar 2020 19:52:31 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: liming.gao@intel.com) IronPort-SDR: wA6TUSHJaZ/6bUh6P1w1yOkWP6xgSP3WBVWAvPKx+Cj+n2q5bbmrF6BJ1tsEDN/BPqAkLSuXIR KZmBKqNpwufg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 19:52:31 -0700 IronPort-SDR: cT6BxjVmmdMr6zQOHXMiVO4jTpPTd3zx3nq+2qgrUPH6O573DzbR+2QKxcwZgMJsMK5EpOlApH kITpUGqHjBQQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,326,1580803200"; d="scan'208";a="272590568" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga004.fm.intel.com with ESMTP; 30 Mar 2020 19:52:31 -0700 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) 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:52:31 -0700 Received: from shsmsx606.ccr.corp.intel.com (10.109.6.216) by SHSMSX601.ccr.corp.intel.com (10.109.6.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 31 Mar 2020 10:52:29 +0800 Received: from shsmsx606.ccr.corp.intel.com ([10.109.6.216]) by SHSMSX606.ccr.corp.intel.com ([10.109.6.216]) with mapi id 15.01.1713.004; Tue, 31 Mar 2020 10:52:29 +0800 From: "Liming Gao" To: "Luo, Heng" , "Ni, Ray" , "devel@edk2.groups.io" CC: "Bi, Dandan" , "Dong, Eric" 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: AQHWBljqg765PFoxK0ySBxYmUIuL/6hgUIkAgAETKQCAAJ39gA== Date: Tue, 31 Mar 2020 02:52:28 +0000 Message-ID: <4ef6c4828d1845deb5638d55289cbfa9@intel.com> 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: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action x-originating-ip: [10.239.127.36] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable Ray: Package has dec file in its root directory. Package DSC file is optional. Thanks Liming -----Original Message----- From: Luo, Heng =20 Sent: 2020=1B$BG/=1B(B3=1B$B7n=1B(B31=1B$BF|=1B(B 9:25 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 in= dex 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 impor= t 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, Liming=20 > ; Dong, Eric > Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature=20 > domains to package path >=20 > > + # 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 >=20 > Will this change include "AdvancedFeaturePkg" and "TemplateFeaturePkg" > folder as well? >=20 > Can you please revise the patch to skip adding folders that contains=20 > package contents to the PACKAGES_PATH? >=20 > Liming, > What's the criteria of a package? Can we treat a folder that contains ".d= ec" > and "dsc" files as a package directory? >=20 > Thanks, > Ray