From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.608.1585617929851841564 for ; Mon, 30 Mar 2020 18:25:29 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: heng.luo@intel.com) IronPort-SDR: 4z6+h99v3a9kBgDEyQXdRh+RAQlT0lvk+WjlfBg/Q+RdCCTtiRbAGUPCMZRPBavnqSkm5aeWUy jwnt4bDAld7Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 18:25:29 -0700 IronPort-SDR: Y8ws1FiARqHmB3Yi1DUBOn93VPuZsUe37t0AgB6Ll0xeA5DZiTc1P4NWcDd+WYIVrJZpy6sTzV EoAyTsaOgMbg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,326,1580803200"; d="scan'208";a="272571521" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga004.fm.intel.com with ESMTP; 30 Mar 2020 18:25:28 -0700 Received: from fmsmsx125.amr.corp.intel.com (10.18.125.40) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 30 Mar 2020 18:25:28 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX125.amr.corp.intel.com (10.18.125.40) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 30 Mar 2020 18:25:28 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.146]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.209]) with mapi id 14.03.0439.000; Tue, 31 Mar 2020 09:25:25 +0800 From: "Heng Luo" To: "Ni, Ray" , "devel@edk2.groups.io" CC: "Bi, Dandan" , "Gao, Liming" , "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: AQHWBljpwmxq0IH8REOyFfJAZKMvr6hg1aoQgAETsaA= Date: Tue, 31 Mar 2020 01:25:24 +0000 Message-ID: <8AA0A44780D72D4CABD3ED3688D16E3E78FC766E@SHSMSX103.ccr.corp.intel.com> References: <20200330060306.1695-1-heng.luo@intel.com> <20200330060306.1695-2-heng.luo@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C4CA684@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5C4CA684@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: heng.luo@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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, Liming ; > Dong, Eric > Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature domain= s 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 pack= age > 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