[PATCH 0/3] Fix build error of OpenBoard

[PATCH 0/3] Fix build error of OpenBoard

[Heng Luo]

*** BLURB HERE ***

Heng Luo (3):
  Platform/Intel: Add all pathes of feature domains to package path
  Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround
  Features/Intel: Correct wrong codes and remove unnecessary codes

 Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc | 4 +++-
 Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf | 5 ++++-
 Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc                     | 9 ---------
 Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf                      | 2 +-
 Platform/Intel/build_bios.py                                                            | 7 ++++++-
 5 files changed, 14 insertions(+), 13 deletions(-)

-- 
2.24.0.windows.2

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

[Heng Luo]

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644

Add all pathes of feature domains to package path in build_bios.py.

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Heng Luo <heng.luo@intel.com>
---
 Platform/Intel/build_bios.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py
index 1ef35aca0a..b9ad980510 100644
--- a/Platform/Intel/build_bios.py
+++ b/Platform/Intel/build_bios.py
@@ -3,7 +3,7 @@
 # Builds BIOS using configuration files and dynamically
 # imported functions from board directory
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
@@ -120,6 +120,11 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None):
     config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON"]
     config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON_BIN"]
     config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_FEATURES"]
+    # 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
     config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_DRIVERS"]
     config["PACKAGES_PATH"] += os.pathsep + \
         os.path.join(config["WORKSPACE"], "FSP")
-- 
2.24.0.windows.2

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

[Ni, Ray]

> +    # 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

Re: [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@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

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

[Dong, Eric]

[-- Attachment #1: Type: text/plain, Size: 2937 bytes --]

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 <ray.ni@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

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

[-- Attachment #2: Type: text/html, Size: 10498 bytes --]

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

[Liming Gao]

Ray:
  Package has dec file in its root directory. Package DSC file is optional.

Thanks
Liming
-----Original Message-----
From: Luo, Heng <heng.luo@intel.com> 
Sent: 2020年3月31日 9:25
To: Ni, Ray <ray.ni@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

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

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

[Heng Luo]

OK, it means we just need to check dec file

Best Regards
Heng

> -----Original Message-----
> From: Gao, Liming <liming.gao@intel.com>
> Sent: Tuesday, March 31, 2020 10:52 AM
> To: Luo, Heng <heng.luo@intel.com>; Ni, Ray <ray.ni@intel.com>;
> devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>
> Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to
> package path
> 
> Ray:
>   Package has dec file in its root directory. Package DSC file is optional.
> 
> Thanks
> Liming
> -----Original Message-----
> From: Luo, Heng <heng.luo@intel.com>
> Sent: 2020年3月31日 9:25
> To: Ni, Ray <ray.ni@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
> 
> 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

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

[Ni, Ray]

Liming,
Where can I find the rule?

Thanks,
Ray

> -----Original Message-----
> From: Gao, Liming <liming.gao@intel.com>
> Sent: Tuesday, March 31, 2020 10:52 AM
> To: Luo, Heng <heng.luo@intel.com>; Ni, Ray <ray.ni@intel.com>; devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>
> Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to package path
> 
> Ray:
>   Package has dec file in its root directory. Package DSC file is optional.
> 
> Thanks
> Liming
> -----Original Message-----
> From: Luo, Heng <heng.luo@intel.com>
> Sent: 2020年3月31日 9:25
> To: Ni, Ray <ray.ni@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
> 
> 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

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

[Liming Gao]

EDKII DEC spec https://github.com/tianocore-docs/edk2-DecSpecification/tree/release/1.27/2_dec_file_overview 

DEC File Overview

An EDK II Package (directory) is a directory that contains an EDK II package declaration (DEC) file. Only one DEC file is permitted per directory. EDK II Packages cannot be nested within other EDK II Packages.

Thanks
Liming
-----Original Message-----
From: Ni, Ray <ray.ni@intel.com> 
Sent: 2020年3月31日 13:03
To: Gao, Liming <liming.gao@intel.com>; Luo, Heng <heng.luo@intel.com>; devel@edk2.groups.io
Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>
Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to package path

Liming,
Where can I find the rule?

Thanks,
Ray

> -----Original Message-----
> From: Gao, Liming <liming.gao@intel.com>
> Sent: Tuesday, March 31, 2020 10:52 AM
> To: Luo, Heng <heng.luo@intel.com>; Ni, Ray <ray.ni@intel.com>; 
> devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>
> Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature 
> domains to package path
> 
> Ray:
>   Package has dec file in its root directory. Package DSC file is optional.
> 
> Thanks
> Liming
> -----Original Message-----
> From: Luo, Heng <heng.luo@intel.com>
> Sent: 2020年3月31日 9:25
> To: Ni, Ray <ray.ni@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
> 
> 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

[PATCH 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround

[Heng Luo]

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644

Need to add LogoFeaturePkg to TemporaryBuildWorkaround because
OpenBoard still includes TemporaryBuildWorkaround for building BIOS.

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Heng Luo <heng.luo@intel.com>
---
 Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc | 4 +++-
 Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc
index 227ae00908..c62f9ecc6e 100644
--- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc
+++ b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc
@@ -13,7 +13,7 @@
 # When the BaseTools update is complete, this file can entirely be removed
 # from this package.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -49,6 +49,8 @@
   gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable                  |FALSE
   gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable            |FALSE
   gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable    |FALSE
+  gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable                      |FALSE
+  gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable                              |FALSE
 !endif
 
 #
diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf
index 74176d1989..00818fbe0a 100644
--- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf
+++ b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf
@@ -13,7 +13,7 @@
 # When the BaseTools update is complete, this file can entirely be removed
 # from this package.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -40,6 +40,7 @@
   PowerManagement/S3FeaturePkg/S3FeaturePkg.dec
   SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
   UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec
+  UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec
 
 [FeaturePcd]
   gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable
@@ -49,6 +50,8 @@
   gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable
   gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable
   gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable
+  gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable
+  gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable
 
 [Sources]
   TemporaryBuildWorkaround.c
-- 
2.24.0.windows.2

Re: [edk2-devel] [PATCH 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Heng Luo
> Sent: Monday, March 30, 2020 2:03 PM
> To: devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Gao, Liming <liming.gao@intel.com>; Dong, Eric <eric.dong@intel.com>; Ni, Ray
> <ray.ni@intel.com>
> Subject: [edk2-devel] [PATCH 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround
> 
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644
> 
> Need to add LogoFeaturePkg to TemporaryBuildWorkaround because
> OpenBoard still includes TemporaryBuildWorkaround for building BIOS.
> 
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Heng Luo <heng.luo@intel.com>
> ---
>  Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc | 4 +++-
>  Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf | 5 ++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc
> b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc
> index 227ae00908..c62f9ecc6e 100644
> --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc
> +++ b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc
> @@ -13,7 +13,7 @@
>  # When the BaseTools update is complete, this file can entirely be removed
> 
>  # from this package.
> 
>  #
> 
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> 
> +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
> 
>  #
> 
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
> @@ -49,6 +49,8 @@
>    gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable                  |FALSE
> 
>    gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable            |FALSE
> 
>    gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable    |FALSE
> 
> +  gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable                      |FALSE
> 
> +  gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable                              |FALSE
> 
>  !endif
> 
> 
> 
>  #
> 
> diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf
> b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf
> index 74176d1989..00818fbe0a 100644
> --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf
> +++ b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf
> @@ -13,7 +13,7 @@
>  # When the BaseTools update is complete, this file can entirely be removed
> 
>  # from this package.
> 
>  #
> 
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> 
> +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
> 
>  #
> 
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
> @@ -40,6 +40,7 @@
>    PowerManagement/S3FeaturePkg/S3FeaturePkg.dec
> 
>    SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
> 
>    UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec
> 
> +  UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec
> 
> 
> 
>  [FeaturePcd]
> 
>    gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable
> 
> @@ -49,6 +50,8 @@
>    gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable
> 
>    gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable
> 
>    gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable
> 
> +  gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable
> 
> +  gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable
> 
> 
> 
>  [Sources]
> 
>    TemporaryBuildWorkaround.c
> 
> --
> 2.24.0.windows.2
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> 
> View/Reply Online (#56599): https://edk2.groups.io/g/devel/message/56599
> Mute This Topic: https://groups.io/mt/72646658/1712937
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub  [ray.ni@intel.com]
> -=-=-=-=-=-=

[PATCH 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes

[Heng Luo]

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644

Correct wrong codes and remove unnecessary codes in LogoFeaturePkg.

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Heng Luo <heng.luo@intel.com>
---
 Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 9 ---------
 Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf  | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc
index fca0bfd540..d2dcdeb36a 100644
--- a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc
+++ b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc
@@ -25,15 +25,6 @@
   !error "DXE_ARCH must be specified to build this feature!"
 !endif
 
-################################################################################
-#
-# Packages Section - Make sure PCD can be directly used in a conditional statement
-# in a DSC which includes this DSC file.
-#
-################################################################################
-[Packages]
-  LogoFeaturePkg/LogoFeaturePkg.dec
-
 ################################################################################
 #
 # Library Class section - list of all Library Classes needed by this feature.
diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf b/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf
index 080c87223c..fead9f3b02 100644
--- a/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf
+++ b/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf
@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
-!if gSmbiosFeaturePkgTokenSpaceGuid.PcdJpgEnable == TRUE
+!if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable == TRUE
   INF LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf
 !else
   INF LogoFeaturePkg/LogoDxe/LogoDxe.inf
-- 
2.24.0.windows.2

Re: [edk2-devel] [PATCH 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Heng Luo
> Sent: Monday, March 30, 2020 2:03 PM
> To: devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Gao, Liming <liming.gao@intel.com>; Dong, Eric <eric.dong@intel.com>; Ni, Ray
> <ray.ni@intel.com>
> Subject: [edk2-devel] [PATCH 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes
> 
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644
> 
> Correct wrong codes and remove unnecessary codes in LogoFeaturePkg.
> 
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Heng Luo <heng.luo@intel.com>
> ---
>  Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 9 ---------
>  Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf  | 2 +-
>  2 files changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc
> b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc
> index fca0bfd540..d2dcdeb36a 100644
> --- a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc
> +++ b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc
> @@ -25,15 +25,6 @@
>    !error "DXE_ARCH must be specified to build this feature!"
> 
>  !endif
> 
> 
> 
> -################################################################################
> 
> -#
> 
> -# Packages Section - Make sure PCD can be directly used in a conditional statement
> 
> -# in a DSC which includes this DSC file.
> 
> -#
> 
> -################################################################################
> 
> -[Packages]
> 
> -  LogoFeaturePkg/LogoFeaturePkg.dec
> 
> -
> 
>  ################################################################################
> 
>  #
> 
>  # Library Class section - list of all Library Classes needed by this feature.
> 
> diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf
> b/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf
> index 080c87223c..fead9f3b02 100644
> --- a/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf
> +++ b/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf
> @@ -6,7 +6,7 @@
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> -!if gSmbiosFeaturePkgTokenSpaceGuid.PcdJpgEnable == TRUE
> 
> +!if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable == TRUE
> 
>    INF LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf
> 
>  !else
> 
>    INF LogoFeaturePkg/LogoDxe/LogoDxe.inf
> 
> --
> 2.24.0.windows.2
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> 
> View/Reply Online (#56600): https://edk2.groups.io/g/devel/message/56600
> Mute This Topic: https://groups.io/mt/72646659/1712937
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub  [ray.ni@intel.com]
> -=-=-=-=-=-=