From: "Heng Luo" <heng.luo@intel.com>
To: "Ni, Ray" <ray.ni@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Bi, Dandan" <dandan.bi@intel.com>,
"Gao, Liming" <liming.gao@intel.com>,
"Dong, Eric" <eric.dong@intel.com>
Subject: Re: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to package path
Date: Tue, 31 Mar 2020 01:25:24 +0000 [thread overview]
Message-ID: <8AA0A44780D72D4CABD3ED3688D16E3E78FC766E@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5C4CA684@SHSMSX104.ccr.corp.intel.com>
Hi Liming,
I will apply the change below if you agree to we treat a folder that contains ".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="DEBUG", silent=False, toolchain=None):
# add all feature domains in WORKSPACE_FEATURES to package path
for filename in os.listdir(config["WORKSPACE_FEATURES"]):
filepath = 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"] += os.pathsep + filepath
config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_DRIVERS"]
config["PACKAGES_PATH"] += os.pathsep + \
Best Regards
Heng
> -----Original Message-----
> From: Ni, Ray <ray.ni@intel.com>
> Sent: Monday, March 30, 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@intel.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_FEATURES to package path
> > + for filename in os.listdir(config["WORKSPACE_FEATURES"]):
> > + filepath = os.path.join(config["WORKSPACE_FEATURES"], filename)
> > + if os.path.isdir(filepath):
> > + config["PACKAGES_PATH"] += 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 package
> contents to the PACKAGES_PATH?
>
> Liming,
> What's the criteria of a package? Can we treat a folder that contains ".dec"
> and "dsc" files as a package directory?
>
> Thanks,
> Ray
next prev parent reply other threads:[~2020-03-31 1:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 6:03 [PATCH 0/3] Fix build error of OpenBoard Heng Luo
2020-03-30 6:03 ` [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to package path Heng Luo
2020-03-30 9:00 ` Ni, Ray
2020-03-31 1:25 ` Heng Luo [this message]
2020-03-31 2:48 ` Dong, Eric
2020-03-31 2:52 ` Liming Gao
2020-03-31 3:04 ` Heng Luo
2020-03-31 5:03 ` Ni, Ray
2020-03-31 5:38 ` Liming Gao
2020-03-30 6:03 ` [PATCH 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround Heng Luo
2020-03-31 1:28 ` [edk2-devel] " Ni, Ray
2020-03-30 6:03 ` [PATCH 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes Heng Luo
2020-03-31 1:28 ` [edk2-devel] " Ni, Ray
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8AA0A44780D72D4CABD3ED3688D16E3E78FC766E@SHSMSX103.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox