From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.44496.1585547706947264560 for ; Sun, 29 Mar 2020 22:55:07 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: heng.luo@intel.com) IronPort-SDR: qbCqWKHFKeQZNmtzKXriXSQos5h/nkoHMamd72qMcl2kkBl8+ZI+mX70sGH4LyP7WeLYzsd6pr cCEH/dvwukxg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2020 22:55:06 -0700 IronPort-SDR: fKS/SNYA7Sz+9Jl3kwiUNhbjs06yFykSdhQYUsaDd5i2XjGMGNRKR1cSQQ98FMCwG3dV9JJ3dh OBRT7iuPgYOg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,323,1580803200"; d="scan'208";a="272264898" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga004.fm.intel.com with ESMTP; 29 Mar 2020 22:55:06 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 29 Mar 2020 22:55:06 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 29 Mar 2020 22:55:05 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Sun, 29 Mar 2020 22:55:05 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.146]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.22]) with mapi id 14.03.0439.000; Mon, 30 Mar 2020 13:55:03 +0800 From: "Heng Luo" To: "Ni, Ray" , "devel@edk2.groups.io" CC: "Bi, Dandan" , "Gao, Liming" , "Dong, Eric" Subject: Re: [PATCH] Fix build error of OpenBoard caused by change of AdvancedFeaturePkg Thread-Topic: [PATCH] Fix build error of OpenBoard caused by change of AdvancedFeaturePkg Thread-Index: AQHWBkwDSaVzpTsl3EOss5M9AEaVgqhgi/KggAAW4IA= Date: Mon, 30 Mar 2020 05:55:03 +0000 Message-ID: <8AA0A44780D72D4CABD3ED3688D16E3E78FC6F98@SHSMSX103.ccr.corp.intel.com> References: <20200330042957.2031-1-heng.luo@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C4C9168@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5C4C9168@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 OK, I will send the separated patches. Best Regards Heng > -----Original Message----- > From: Ni, Ray > Sent: Monday, March 30, 2020 12:38 PM > To: Luo, Heng ; devel@edk2.groups.io > Cc: Bi, Dandan ; Gao, Liming ; > Dong, Eric > Subject: RE: [PATCH] Fix build error of OpenBoard caused by change of > AdvancedFeaturePkg >=20 > Heng, > Can you please separate the patch to 3 so each patch fixes one issue > specifically? >=20 > I am fine with one Bugzilla to cover the 3 issues. >=20 > Thanks, > Ray >=20 > > -----Original Message----- > > From: Luo, Heng > > Sent: Monday, March 30, 2020 12:30 PM > > To: devel@edk2.groups.io > > Cc: Bi, Dandan ; Gao, Liming > > ; Dong, Eric ; Ni, Ray > > > > Subject: [PATCH] Fix build error of OpenBoard caused by change of > > AdvancedFeaturePkg > > > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2644 > > > > 1. Add all pathes of feature domains to package path. > > 2. Add LogoFeaturePkg to TemporaryBuildWorkaround. > > 3. Correct wrong codes and remove unnecessary codes in LogoFeaturePkg > > > > Cc: Dandan Bi > > Cc: Liming Gao > > Cc: Eric Dong > > Cc: Ray Ni > > Signed-off-by: Heng Luo > > --- > > > > > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporar > yB > > uildWorkaround.dsc | 4 +++- > > > > > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporar > yB > > uildWorkaround.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(-) > > > > diff --git > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.dsc > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.dsc > > index 227ae00908..c62f9ecc6e 100644 > > --- > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.dsc > > +++ > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.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.
> > > > +# Copyright (c) 2019 - 2020, Intel Corporation. All rights > > +reserved.
> > > > # > > > > # 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/Tempor > ary > > BuildWorkaround.inf > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.inf > > index 74176d1989..00818fbe0a 100644 > > --- > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.inf > > +++ > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.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.
> > > > +# Copyright (c) 2019 - 2020, Intel Corporation. All rights > > +reserved.
> > > > # > > > > # 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 > > > > 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 f= eature. > > > > 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.f > > +++ df > > @@ -6,7 +6,7 @@ > > # SPDX-License-Identifier: BSD-2-Clause-Patent > > > > # > > > > ## > > > > -!if gSmbiosFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE > > > > +!if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE > > > > INF LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf > > > > !else > > > > INF LogoFeaturePkg/LogoDxe/LogoDxe.inf > > > > 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.
> > > > +# Copyright (c) 2019 - 2020, Intel Corporation. All rights > > +reserved.
> > > > # SPDX-License-Identifier: BSD-2-Clause-Patent > > > > # > > > > > > > > @@ -120,6 +120,11 @@ def pre_build(build_config, build_type=3D"DEBUG", > > silent=3DFalse, toolchain=3DNone): > > config["PACKAGES_PATH"] +=3D os.pathsep + > > config["WORKSPACE_SILICON"] > > > > config["PACKAGES_PATH"] +=3D os.pathsep + > > config["WORKSPACE_SILICON_BIN"] > > > > config["PACKAGES_PATH"] +=3D os.pathsep + > > config["WORKSPACE_FEATURES"] > > > > + # 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): > > > > + config["PACKAGES_PATH"] +=3D os.pathsep + filepath > > > > config["PACKAGES_PATH"] +=3D os.pathsep + > > config["WORKSPACE_DRIVERS"] > > > > config["PACKAGES_PATH"] +=3D os.pathsep + \ > > > > os.path.join(config["WORKSPACE"], "FSP") > > > > -- > > 2.24.0.windows.2