[edk2-devel] [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to package path

[Heng Luo]

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 at intel.com>
> Sent: Monday, March 30, 2020 5:01 PM
> To: Luo, Heng <heng.luo at intel.com>; devel at edk2.groups.io
> Cc: Bi, Dandan <dandan.bi at intel.com>; Gao, Liming <liming.gao at intel.com>;
> Dong, Eric <eric.dong at 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

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#56700): https://edk2.groups.io/g/devel/message/56700
Mute This Topic: https://groups.io/mt/72646657/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-