From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web08.13699.1658639180154231033 for ; Sat, 23 Jul 2022 22:06:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=KPKz5vMQ; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: bob.c.feng@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658639180; x=1690175180; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Y6XVvG7gm9GMYDxe/RwiMGbAM84GJO4MCHv75I7mxJA=; b=KPKz5vMQNJRzoKjeiGNDrR+Gk9hYqtHDPnxZHwK8cOjATI+UmDjHWzWT 00wh9llqvJ4O1q6steJTVg8GnTQ7DqpPnE10C4f9gk4nMJaBVRBSFx58q QjZ8LMZYXf2Dvzlx1Vr++fDK1wkvbUIetfwmKxTrlYg80VP8+iiTqhkVz UVAjacsBtvlqg42cP1hARrpGNwWlrOMwzg4Cr/BX3F+xfLuyqUxyBcgdY OMA3pdOy+TO0DGLSVPd69dzXEf/1jQCApCNBOaTj2sWNUmRTk5jtYQc2/ LO3ko8v+SCj88NmWkiPSnoGJfq/OQvOPl4PG6D+ZuBsKZKc60HUAQ6BMZ A==; X-IronPort-AV: E=McAfee;i="6400,9594,10417"; a="288695742" X-IronPort-AV: E=Sophos;i="5.93,189,1654585200"; d="scan'208";a="288695742" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2022 22:06:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,189,1654585200"; d="scan'208";a="667100880" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga004.fm.intel.com with ESMTP; 23 Jul 2022 22:06:19 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) 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.2375.28; Sat, 23 Jul 2022 22:06:18 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28 via Frontend Transport; Sat, 23 Jul 2022 22:06:18 -0700 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (104.47.56.48) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Sat, 23 Jul 2022 22:06:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=brrSPvPljuCIDNo3hquFeLe06X6iMdTc9odo0NsU1GwfpJOxdv4VS/soWiJdHZP8oMFphp0vLoLIH83hJPswOKQHGGBUEiwGL5lvo5YraOYKbIJQmArgWOu+gRihg1UoqnafYPOGo7lxpYKQ593uyfpGYgKksYf/o8yX3gFU1kh8bCvBaY5ZmWGMBqKBXa0hYWbILxPT65sbbesBRImyiOJ2dGPlIxuFHRX82f2QgNtr0GalYU/HM6p7FEB6B2JLUcSXaAaz1JqGq9IotPHHCEJoZ+FjR7MkMFih3fvZqeJ5qXcPcxZVqQrNYe3pTTZbe0Sb7EnmH533D+IN4lof0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=L9C0fog+9KPl8gglUWAoiFzroFWJNYEHdFzXe4MZ/L4=; b=DgvjUNcUbQKV+zYAdoTOMcaVdrOT2NU3/Pseehk+z14QBEXMWey0KpwIKRP6Htfe8YkGbFRcrgrxcN9HCUS3AjUFVCIsBrwVRkNkOKKudcW9itmjknSO4tMoykp7uIa3K9TonfMwY0nKvrSzdn0/WeP6Nv17yq5i1ppJALphKl70jGonhArD9LNooIqZycW82D7ENvJH5BlOgDSHIcOJq94gzpyBEqfxBGpEhnZ4o5HDB/gulucfnSp0R/b1E0ER0QNgdSuk6levUYl9IKDazUll6XL3Kj8VdrzdsBlVFIwgHF92jWNlQAElLrWxv0LMh9bDUCofX99M1voaib0X7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from PH7PR11MB5863.namprd11.prod.outlook.com (2603:10b6:510:135::11) by CH0PR11MB5410.namprd11.prod.outlook.com (2603:10b6:610:d1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.19; Sun, 24 Jul 2022 05:06:16 +0000 Received: from PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::943:4b5a:b96b:30f8]) by PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::943:4b5a:b96b:30f8%5]) with mapi id 15.20.5458.023; Sun, 24 Jul 2022 05:06:16 +0000 From: "Bob Feng" To: "Li, Yi1" , "devel@edk2.groups.io" CC: "Gao, Liming" Subject: Re: [PATCH 1/1] BaseTools: INF should use latest Pcd value instead of default value Thread-Topic: [PATCH 1/1] BaseTools: INF should use latest Pcd value instead of default value Thread-Index: AQHYlOncw37zgCyC9UGZvW+qXJryKa2NDEOA Date: Sun, 24 Jul 2022 05:06:15 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.500.17 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f3d49c79-de07-40ed-90f4-08da6d323cb4 x-ms-traffictypediagnostic: CH0PR11MB5410:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zFpjC4kpbiqgrCXCO1vHUbbiH74rlKIlC+LbBlITr7ELFsPjVBNCqL1fLGX9BLKVc1nTgFe/r1ssr04VTyOWy2qBrr630J+ugaweRRj4t6xGsqVMOLVrt9f6IzruoPiAUPVgFMQ3tUewnWgCU0CElRUhlGZomSOH3aCmRTAuhxLTfB+GWvVGAN4UjdOFE/9ZID+o+0xZQk5qDMvlG2fbpOwUtPwfDmH7k3VCUE3PDwc7QrtC+vT5vYLBrCmcQRrr2NOa58kGffhK8Th6isFtWE7UZ1PKN7jgTcdZ+v3j3usLhc3DK3/2Q4gtodPQrub3JWsQaotWKJLC88oipFm8yI98VUwLBeUNNim3jY2npmfOBZBC85/yn+yHA7skO9T5NAtZMtN8c3m9OISi2hkQ9NFIZPbUnkm261aoX3CgwD0i4hTDf1IfuWTETbpqLftfV8Mz8DSFm+OUD3iDO0Q2bbb/I9ovowMh0wimKxpJh0VJXaJJlbDJGfnGit0/DWypjcDha04XDSsiT3/egsydw4Arz3MJ19gKfotGLFMYIpTMKhQ1cW14oheSOEM7fvEn0jFXyJsMmuBDhrEs5ni1YETcxsXcYj78ws0iEC+N9rdt3KfDZTAl9sKdQ4NXlsQFgU8VMZkoliJDsfiGfrNsbS/Iw5zaUn8ckLeAuAXchvUZ9ccUVznzTlf9WAedYtOo+Hkd7pg7qGBJRvl9sZy2QkTui1IXhpgDNTkRwfE2zFX+KY8z9yGK2ToDIEwv0EO7AvNQy+jtAEY0kA9pk6p8cbPV+WBov0jV1F17i+2zLy/62Z1+b3LH0+jPcWq8g/01 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR11MB5863.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(39860400002)(376002)(346002)(396003)(136003)(316002)(110136005)(41300700001)(71200400001)(26005)(9686003)(6506007)(7696005)(53546011)(478600001)(76116006)(2906002)(55016003)(66946007)(66556008)(66446008)(8676002)(4326008)(5660300002)(64756008)(66476007)(52536014)(8936002)(38100700002)(122000001)(38070700005)(82960400001)(33656002)(86362001)(186003)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?opY1xAf8YDzWxflNdWuCupftwyReaqoakQDlYxLfB+bWiUee5SlCSHgi8HVr?= =?us-ascii?Q?alpa4imlBY3fESFaW/xVG5PZazgAowux7qy4+bkgBeKY/bsw6SMy5uA7LwTi?= =?us-ascii?Q?ODCKOVB8zbmedvl/GVmFh1FvC18c4tNPe0U81PD0Hy++9eU7RvhaLvRwCawp?= =?us-ascii?Q?8Vfc7EeqdWQx7SExzLPdb18iYjBCrOHQ6MoSMogoBpyRYj5YATIln7ZmcPRW?= =?us-ascii?Q?U1U4fmumkcG39jUWs1RrWEsV+xiKZkCf+InH369AOXQQkH7oZdVAmm+5NTbP?= =?us-ascii?Q?veIsFbrh3fQWaZEHEbX+skWms2zDCKLevWby3PPYwgV4EHr9qIq1Sx8DvsJL?= =?us-ascii?Q?prDXpZcnpOk7Yz0I9JRtB8hxUutFiDscR23+xcOS3Cif1i0LpTDVZ2Q14T4h?= =?us-ascii?Q?snzgMaZKvChEvnuhzxxTKvynxjYq/QaEAKVWDF2Wz1Lswh/TD85aPv0HfGzz?= =?us-ascii?Q?pwF/ElkZ6XY1fMTi77ldgXZQGCRHKY5VpctMUf6GXYC68k1IUMAWMJE9kY4B?= =?us-ascii?Q?EtTgo4iBFIkvbjIDXBOso/lMJzfCpFbKthroGrklBQcYguFah6IQ6kQs7w2V?= =?us-ascii?Q?CC9LpoHtGUzuHeHVpiaMsfdLy702zh24XNmYoYo7nkqcRddOah91vRpM3Hps?= =?us-ascii?Q?pvH+ZZxZxTZ0jIoE758DgWNRmsM9upyr+3MMWFmK3fNQR+cJYLYN8yBz63+7?= =?us-ascii?Q?esuKYrZSsWMVOFkO78ZxDNbJFeTCvbZxHArTpm/EQWKimC5NiUnFRx+31X4f?= =?us-ascii?Q?HSIRBwqUWs6A+sc63OJf73QHSuEz3GwDs3J/Jq15gn8/0C1H7NQzadb9Ap+p?= =?us-ascii?Q?iIYFWluGy1k9STQlcX7UfealfXOtU6zz2jvs9mlV8427z96BWch0wIJaGe+o?= =?us-ascii?Q?PsHVtOvMjijIvppOzZ73So2U33sAsZdcgRsCtg/cQAecW016rTGPhULulM1W?= =?us-ascii?Q?niaq5zhmfeEH84rr5mvLI/YazHefKYceabzb19b0gSKEElR7LgWyDyz3CPFk?= =?us-ascii?Q?/ILdzU15JA5goejM311eqFCwdixUciRnmpaDhcNhDSfNlmLpcMZkJ758AIz9?= =?us-ascii?Q?BIgF7SV0pS4VqRasHhq/B742ywi9gm85YGjs8gG+c2YsQ13IbU0zNOHiMAa4?= =?us-ascii?Q?caQfog24smo0HSJBu6N5gd0A+psM5GKymTk5Z1SYx6UdpKXqrcKhyklJH3JY?= =?us-ascii?Q?BIJfohGERR3yUupJXwojnN4bsXR8KL+3gurIrQ/wMSJJ05NMKekXUNL7qJn7?= =?us-ascii?Q?sdfe1tuGd4gG6TLEgLHFi77D7+ITQQPepjt5ZBQq1NR+HPVH7kr7XRma252a?= =?us-ascii?Q?ZIONGDL00kxF1CiBlgyUgQld2fUlz25BanubzztuX69pNSEPmBPb9D0qxsQE?= =?us-ascii?Q?kpQW0IWQA4dgbVy7d0/cbddmdvGfKwZkY+UsAxt95RKz9N7JwA+CZjv7amjq?= =?us-ascii?Q?EN0k9Rv6OZdwFivi66TCcdtdXnArjUAnhWow/gsTU438yzqKNvez8Xr5Wt4u?= =?us-ascii?Q?HkEmIhEkH6YA6PsP+J8XiPFiPTtrXOp9cWvkUpfH40joKoydVnbGAZpp904N?= =?us-ascii?Q?PdFIHLTa7DohcSgOhFjsvDSCCDiE/0owWIppqidA?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5863.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3d49c79-de07-40ed-90f4-08da6d323cb4 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jul 2022 05:06:16.0137 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: dffxqbouH86nAUmp26Pi0KfhCKDAYo0XtXlkzxFDPqh1S+jznXi3RtqKDKvK+Xu9g2tROgqhvtZQ2BoPg2FJSQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5410 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Li, Yi1 =20 Sent: Monday, July 11, 2022 1:48 PM To: devel@edk2.groups.io Cc: Li, Yi1 ; Feng, Bob C ; Gao, Li= ming Subject: [PATCH 1/1] BaseTools: INF should use latest Pcd value instead of = default value This patch is a bug fix about FeatureFlagExpression in INF file: INF [Source] section now unconditionally use Pcd default value in DEC whe= n handling FeatureFlagExpression, it is wrong. If a Pcd value has been set in the DSC file, we should use latest value i= n DSC instead of default value. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Yi Li --- BaseTools/Source/Python/Workspace/InfBuildData.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/= Source/Python/Workspace/InfBuildData.py index 5b9b3d7b4f..e4ff1c6686 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -1084,7 +1084,9 @@ class InfBuildData(ModuleBuildClassObject): else: for Name, Guid in self.Pcds: if self.Pcds[(Name, Guid)].Type =3D=3D 'FeatureFlag' or se= lf.Pcds[(Name, Guid)].Type =3D=3D 'FixedAtBuild': - Pcds['%s.%s' % (Guid, Name)] =3D self.Pcds[(Name, Guid= )].DefaultValue + PcdFullName =3D '%s.%s' % (Guid, Name); + if not PcdFullName in Pcds: + Pcds[PcdFullName] =3D self.Pcds[(Name,=20 + Guid)].DefaultValue try: Value =3D ValueExpression(Instance, Pcds)() if Value =3D=3D True: -- 2.31.1.windows.1