From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.33394.1661487526664679665 for ; Thu, 25 Aug 2022 21:18:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=htQvxeZJ; spf=pass (domain: intel.com, ip: 134.134.136.100, 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=1661487526; x=1693023526; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=G8s19zJyjvqrzes8QugYIpBqGnQODx63lucQbxPCfwY=; b=htQvxeZJjQsWo9GymgiwY6yUroIOHmmzLc9PcER2dj3HEYCeQ4xcfmGu 879tixt1hK/MimcAaZKW8KR44KQIwo2xKnyszoODlaMAcwuUOibzpu3W+ kT2pqNN2UaDmdUPTKvNrWecpuX9vM/lJBoM8mcF0roO6oWKxhqJqEPb+h 1K8m27TUtTaEHrQKwRCtzXuzwwcFoxJXyuYQOuLgwqxdHL8w565FvcI+y sams7JSeRno5CvLEUzNEhqIuMaNgVEZ14Ee1xt8IYwYNvtJ8nUsiSFoTL GPbJqHT5Dj/CWSjN8uPSZgEzJlIvd+nPCi2pSurvR5lyiwJYtQ3kcezwx Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10450"; a="358387538" X-IronPort-AV: E=Sophos;i="5.93,264,1654585200"; d="scan'208";a="358387538" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2022 21:18:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,264,1654585200"; d="scan'208";a="938610275" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga005.fm.intel.com with ESMTP; 25 Aug 2022 21:18:03 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 25 Aug 2022 21:18:03 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Thu, 25 Aug 2022 21:18:03 -0700 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.174) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Thu, 25 Aug 2022 21:18:01 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XM91hcwE3KqRONdTJUDh3TcGg4X5IljlQwxwZuHoW/gvueg9zcpM4NXXyyCzHiXwfighMG4/NiL6nkrt05yeUrL55jTOxUJSSVW+RGavM/K8VHDlaXVBJVE+pV/YJEydZFWI/lieZvWmDqump9lazzwUMqTvWr7S7sgIK9oy4mSuTP8YOgpvoOfMG/cb2AVvejkdZuJdQmwznXGvhlX74DAqbrrXMe7+nWkez3TKknwmbHvQ1UhXH3Zx4Un8KGwLYXyqbgdHoSaFTdBP+gZRafj2YrXO3sGxPjJ2gOpYdUJjgp9pRWJXEB5UFyTSuHbDU7I0W3sM7wHGcT8InECJEQ== 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=5wHpoBa+asjesURpgUR0+GPyo0mwzhC+o+NM7uJ0VgU=; b=e7lC6FNCcIJN5WMHso+xhMCtTLO0VMKrjqnJiTk6Yc6U8tJk3ekIkzlbOJxuye5nMzuKMvhhQbr2JpbEZuOQBO1iG233HYliSbbZehNUFvUdbHVQhteETKmbzgIggHFIGojjnlpoetyBoKdt5jeH71dz1gAz7I/7wZnYMBxHQC3cTxeBMesPEiWUf7y8kB6FX/MAn6p0ZhpqZwQdKPLaVZEr8QqDxOS4z2J/FL0bwwZIw+didMTOjCI5MuiSHPe5XQsS+6YfvVXtR2K28kDjzskvoQJYKenDZiwTIHM3ai1hfnpYnxCBttvgkHuYqwVEnA3v7K7vJARdbvWTFjlSVQ== 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 BY5PR11MB4039.namprd11.prod.outlook.com (2603:10b6:a03:18b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.21; Fri, 26 Aug 2022 04:17:52 +0000 Received: from PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::191d:2d8d:c7e:40ea]) by PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::191d:2d8d:c7e:40ea%6]) with mapi id 15.20.5566.015; Fri, 26 Aug 2022 04:17:52 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "Gao, Liming" CC: "Chen, Christine" Subject: Re: [edk2-devel] [edk2-stable202208 3/3] Revert "BaseTools: Fix DSC LibraryClass precedence rule" Thread-Topic: [edk2-devel] [edk2-stable202208 3/3] Revert "BaseTools: Fix DSC LibraryClass precedence rule" Thread-Index: AQHYuPG+hJO50AE84kmS4ocDCQJwK63AkyFQ Date: Fri, 26 Aug 2022 04:17:51 +0000 Message-ID: References: <20220826021456.2428-1-gaoliming@byosoft.com.cn> <20220826021456.2428-4-gaoliming@byosoft.com.cn> In-Reply-To: <20220826021456.2428-4-gaoliming@byosoft.com.cn> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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: bb27fc04-b3a0-4cb7-26f7-08da8719f15f x-ms-traffictypediagnostic: BY5PR11MB4039: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: Llngxm7GHtyjysr/s0IOZGS3+2Ca9VXGnBFXHSrz74aVproYsvOBKHpLhyOzxl1a+lOH+eMH8XRHJNSGpfhHNcihqU3FfM3iEDme+/dq8x20jvstOGqH1mTmje6CGdReIlVQhkuJrOHgaR1IeXVuwOFhqob75b22camMOYUUxNNhdGuVZYcFgWdcdMEIspgZp6+j4zq8aEYjVYZobPpHy0PSv+ZDpye2JNfgcsdQA7Z03lrGHVhl5V8reRvgpVvj0d1ESeoL4tc1SvvWIgIiXB7h+VAQjGlYv8h6GEZuTOtSiqJgMiD4zd67DwrSuyQ8toAEVZSY9fEubT9UDSjXbIvSUbK+BAQwZHwLDewTg1qIrYYcbe1S5dp6D+b0m+9JDqgJcjXyjX84A2gW7al52xZHmmzY7bflh9GAR7PuwTbO4h39mMGMvA2c4KfnJLoyClqiAiwfkkTHUhCDFXrfruLNPggfzDyXxA0lzlQYLGpTjp1Xj8oHCkmwavbKIe1MV8lK+jsGuRzryFSNRj6XZQdh5YgqXEg8BY00ThqdyP9dLgpnPx1UJ2/w9J4R90LD7p6rwDws513CfkcitCmpihsETFGTVaUlD1epS7CRd498RC9F97+XqYX9Ceuo9UzSdr5R/ZbDLxTbqqwXQtGOhaLZGqo6dUam4whXawCQevEtE91pAfjV984eA+m4giQJ04EtZV6STLyhGiNfa80wOO050qVJcTU1rBemDTnF8yCPPsZkZd1tuEulw5c+nDoMNF8KH9TxrbIdvs85Neq+VB4DlM6764uDEowEP6BVeaLl1efiBBrux/Yxi4CQ3g3ePufmGGanP75XVcUCE/TYBw== 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)(396003)(346002)(39860400002)(136003)(376002)(366004)(966005)(53546011)(66556008)(186003)(55016003)(64756008)(8676002)(4326008)(52536014)(8936002)(66476007)(66446008)(66946007)(83380400001)(107886003)(26005)(9686003)(76116006)(6506007)(33656002)(478600001)(5660300002)(71200400001)(7696005)(41300700001)(82960400001)(86362001)(122000001)(316002)(110136005)(38100700002)(2906002)(38070700005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?8bYXdQhB8i0XvAZuREnxsoh8gcaXftXUq7TqCzCOjlffUwSPvn+A8diVDOBl?= =?us-ascii?Q?jkOnj7+wecWKKCplVEVzjz8JGowlVmJ7zW2jrvyBb7t9uRkwf/IxiKVEYxtY?= =?us-ascii?Q?Rx8AolMfo44at57Z5y6SNCSTsl/T5vBCEjq15tvRjgg9BDYTBqmVefPU2v4D?= =?us-ascii?Q?PnA/UcOdjlXMYYIKyNZ2Q4cpBEDWk4fF143ETB7YtZc/PJi43k6/TjXU4VxQ?= =?us-ascii?Q?F5UuCUqnm8wI2avh1oE7TCVFNZayEJTu14nlh/Pi4cJRr/9oAgbKvDAJMnyb?= =?us-ascii?Q?JhpU1NzC9u35p1b6C2757oFPc1qthH3K6jVl4gE2dQNBT59r7SEWlRh5P8O/?= =?us-ascii?Q?I19TUkt2+TwZl/2cby/60BFANU7uhAqONi2N+nwaBNU0c2Fu6TX8Ki+uIVrl?= =?us-ascii?Q?WfKuYaII3v+zsgsAP02sNQeSff1uOy7QQGyHTv5QBw+OIOC/ABukdM3tuvee?= =?us-ascii?Q?AJ1eqkW90k7EfIE4bkFcjqV6px0sIIgrT0ThhUsSo8AW16EoA33B7/JrseHX?= =?us-ascii?Q?hJKMPhaNjbOm5v1qN+TdUhJSp3Vw4610Jy7rlnEahT6jDot8FDWIaqx0UMAO?= =?us-ascii?Q?DmXF1JvAoShTd0f4u8AfYWV6Ggs01FAthgeRFtdC2kpXWZBrY0e6rnnD67wg?= =?us-ascii?Q?hWDkcDN1fONOvAqILp2LT2u5MqjsYfO5tSuxYlmh9kwBPbZ7OViZJ7qe326M?= =?us-ascii?Q?GFUt87xwp1V40zAlBio0mcw81LI0B788wmC5Y0aa4FyNjf+u6U+Lt+xnJO47?= =?us-ascii?Q?0dwxfhMnnIoAKsj0EI0D6/JoFMwUGQpucsestnQ2nYI4xT74NiNU8l0Fc9Xx?= =?us-ascii?Q?BfTleOGMAKo7WKGrU0T5yxQ+5gEQp6qWE5u80Gl28tglDFbQx4DhkqXRd2O5?= =?us-ascii?Q?1pURWAf/alEn0jSDJwqomqwrw3fH1Tn0AE7FM2Q0sQ1zW37220R7wPRvUjXD?= =?us-ascii?Q?Ln/iI4woN9lSnPgBjRfX7HCiJg95m0VUnuWibIri9yCaZ0HrQrUv5zmmUV6y?= =?us-ascii?Q?O6uEUT6PbpMvaqXpHCdf5QNZJgrN+LwNaXLBAwoLcPZsQxRcCjviRnLvG2Ku?= =?us-ascii?Q?oaf9saktJJlZfqKorNm9rQgufOze52SDZCKKBU4UTXfocViBe/bLZfIYYBDI?= =?us-ascii?Q?hgrGPP4VebsAbFncrxQJX9zm31ChGupfuwXI+T76aMxUiQyKU23PrYcrCpZX?= =?us-ascii?Q?M7BXrd/961NGY/oAuLIAtgjpi2oWC4H1QgaDl9mGIBzADjZuEctir7hsSZ+v?= =?us-ascii?Q?EUDSEGQaQWw+sDeSEiwnQMU/VhN+XBh6xFlBMnFejlJ9Pr8lr7i+rcRvDuss?= =?us-ascii?Q?az2Si3D0e3EC1lujNcP7Jy+ZHthGSJr5tT8fPdka2kzkWU0rSvbnP9S0Wm/A?= =?us-ascii?Q?mUyeXmw/5PEF4rSQ0v1HrahU4NuFIdOkxB8BQrZmLxa1AJtaU89eshgGAGP0?= =?us-ascii?Q?SGYsZPrlIS+kYV11Nd4LB6+skCsHJXZL0xNtFXnXDooSmFbVGOfaTVL4ixdi?= =?us-ascii?Q?JKgMkGEBWQqmc9B0m9ugJD1vK33vIXx0zMSD9uRUuWfz1fi0awDwYvl9NQj5?= =?us-ascii?Q?zfimBnh5feHrhjZf6NtbYKRy5PPczWtLzilhfRpQ?= 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: bb27fc04-b3a0-4cb7-26f7-08da8719f15f X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Aug 2022 04:17:51.9198 (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: EEgU/AFVBDQ24l6PCzckzHfF/gHJznu2doTz4JSBVTG0qevzLaOv6DVzwAe8sM+geGeztU6y0jj6ClmRrwLShQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4039 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 Acked-by: Bob Feng -----Original Message----- From: devel@edk2.groups.io On Behalf Of gaoliming vi= a groups.io Sent: Friday, August 26, 2022 10:15 AM To: devel@edk2.groups.io Cc: Chen, Christine ; Feng, Bob C Subject: [edk2-devel] [edk2-stable202208 3/3] Revert "BaseTools: Fix DSC Li= braryClass precedence rule" This reverts commit 039bdb4d3e96f9c9264abf135b8a0eef2e2b4860 for tag202208. This brings the behavior changes, and needs more discussion. Signed-off-by: Liming Gao Cc: Yuwei Chen Cc: Bob Feng --- BaseTools/Source/Python/Workspace/DscBuildData.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 41f93c93f2..e9f68384b4 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -872,7 +872,7 @@ class DscBuildData(PlatformBuildClassObject): if ModuleType !=3D TAB_COMMON and ModuleType not in SUP_MO= DULE_LIST: EdkLogger.error('build', OPTION_UNKNOWN, "Unknown modu= le type [%s]" % ModuleType, File=3Dself.MetaFile, ExtraData=3DLibr= aryInstance, Line=3DLineNo) - LibraryClassDict[ModuleType, Arch, LibraryClass] =3D Libra= ryInstance + LibraryClassDict[Arch, ModuleType, LibraryClass] =3D Libra= ryInstance if LibraryInstance not in self._LibraryInstances: self._LibraryInstances.append(LibraryInstance) =20 @@ -881,7 +881,7 @@ class DscBuildData(PlatformBuildClassObject): for LibraryClass in LibraryClassSet: # try all possible module types for ModuleType in SUP_MODULE_LIST: - LibraryInstance =3D LibraryClassDict[ModuleType, self.= _Arch, LibraryClass] + LibraryInstance =3D LibraryClassDict[self._Arch, Modul= eType, LibraryClass] if LibraryInstance is None: continue self._LibraryClasses[LibraryClass, ModuleType] =3D Lib= raryInstance --=20 2.27.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#92832): https://edk2.groups.io/g/devel/message/92832 Mute This Topic: https://groups.io/mt/93262564/1768742 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng@intel.com] -=3D-=3D-=3D-=3D-=3D-=3D