From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.23318.1657501734693010911 for ; Sun, 10 Jul 2022 18:08:54 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=k66xgBEk; spf=pass (domain: intel.com, ip: 192.55.52.88, 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=1657501734; x=1689037734; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=hm6H5BN+Xht0Y/c8mXS/OVJek8P9SFrAjoKpTR3gdF4=; b=k66xgBEkFKehYaTndqwJ8lFV0a5L8vYB+xNo0mny9aCzIPB232gKZvwW zq+VlKi6quGh3X33ZuuDaAn/9FHWoPZtLUH4EF7FC6/bDw9GGYpPjdcGZ pKrnCyXit2yM0edqp/AYh1tbz00rwZ+ffFtJGMariyzXXblDBWEYnVc26 J5dw78NSafNgk4pdP5r1pAt6roapXay1cN6anx/byN+BBSp7wSTOCTMQo lcnfZ7R0MLIydqA8EPBjmmRpKhynBoEydslAnpumkDuBrtIAESD+MTgsF X1bxxq9lSOFzSVoxg6TP1MEtIXhPQCZJYek6VwS8wzY6LkrLLDehumXBT w==; X-IronPort-AV: E=McAfee;i="6400,9594,10404"; a="310154791" X-IronPort-AV: E=Sophos;i="5.92,261,1650956400"; d="scan'208";a="310154791" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2022 18:08:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,261,1650956400"; d="scan'208";a="736923264" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by fmsmga001.fm.intel.com with ESMTP; 10 Jul 2022 18:08:51 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Sun, 10 Jul 2022 18:08:51 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Sun, 10 Jul 2022 18:08:51 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.101) 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.2308.27; Sun, 10 Jul 2022 18:08:50 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=alDAumZ25w4D4nJi6r+dx9bRz/9PWdi2nf/9P2V+Ebeo+ipsl1eBAS6aeXJT98tZjvV3lfpGvqio+TPZDvt5t0JSrmhFZMM9gZEVIrRmxWBtd886eJ/UtEExRCBzoJJPEQ+axpwkPKZx5UDj9v5sZk8UC9T/q9FWksmvSPsMPdLOvxn70rxmQMcUCq0mt4WodY+rDLYwASSnuSXbkJTy7H8KR5pk9/9glLtGU+yEUXZujEwB3J4MChuer2x1Xxa7O5I8oT20YCVtWgO0YTStydwgLBa2rksiHe7HgwsOVLfw5UgiegpcubIVROYtefe+h8tVEbiRWvwBNwbXsg+O/A== 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=in3agLt38f93nfLesYBHcqggAldD6RhDq/B+wYwrvdQ=; b=hsnJZOx9daUQq6k5TVEkkWSIhw/X26YGA6sVFOp4+RrYB1DLohjUpQiiYBPND1LHcmptuYgn1+e0c/FsMYwwRMFAUxqPxu6SRGE2SYK3G7WbO8izbfcmYiCgUjelRvOw+Xp/ndJN/Tv3ZVnD9ZhDeP5FnMjFD332V6Aw3BsneEXe3MOwTy/3W1i67uRvrJIj+rlQw+ArtJxCHwvNZxRjbkOlrzUhUMxRsarzuVGJVHH0FPdLyP+0vvFTSwUrMmHFUVEt+F4TZCVdTQkOzfZEIel+K0MS+GtbWB+NLP4LDcEdBG1D87z7kZ1E8mtvRONzwRsno+IljHZHj7q/DF5PXw== 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 BN6PR11MB1745.namprd11.prod.outlook.com (2603:10b6:404:103::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Mon, 11 Jul 2022 01:08:49 +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.5417.026; Mon, 11 Jul 2022 01:08:49 +0000 From: "Bob Feng" To: "Chen, Christine" , "devel@edk2.groups.io" CC: "Gao, Liming" , "Huang, Long1" , "Ni, Ray" Subject: Re: [PATCH 1/1] BaseTools: Fix DSC LibraryClass precedence rule Thread-Topic: [PATCH 1/1] BaseTools: Fix DSC LibraryClass precedence rule Thread-Index: AQHYjGBgzFDqE2oMZkO2k6WFBg04QK14bLdg Date: Mon, 11 Jul 2022 01:08:48 +0000 Message-ID: References: <20220630090405.1458-1-yuwei.chen@intel.com> In-Reply-To: <20220630090405.1458-1-yuwei.chen@intel.com> 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: 4ef9f34a-443c-439f-33f5-08da62d9e964 x-ms-traffictypediagnostic: BN6PR11MB1745: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: Uu/1ACAthVbODJ3HOefg1J92dcoUYbCqzE2wBw6x/X6gWynAphfa+ouG4/qFpk+ev7f10HnqoGEHR0mKlBPl333B6kixXjsE+F+UJCTPloZ6Gne8c97RpLdgEhQn9oopQDQwuTjVwSSTjsydoeYQT3PUg3RgHO+NM9pzpSyNvAwy+to8nVZ9HS6/cMN4YwVisTQbWT6406lvj0TSbNwNv5t/gbna1S8OS5djyoVwyX7twYQne7ap/oVyu3Gms+tt4wOHKQBsznwfyA4AIqnNddXLIDUW3S/CrOhWUPu7dXtBGKxyeAd84i7QF+BJ3C+r5XUs4Gtbc5hHaYQpGdvKwYlFraGj45hd6MjzC12XTwBVvMSfBSZAlwb8Ea9TItbASm/iM4yEHqPMiXjI1AqwUQ26zbi41eH2LON/SEzUN0AgZQkk6fkUZiR15wrGYpWNSwgKBwYqO35mW7iLplwjxJfzrFiVvwyYxQj5Xqgz79WUSoQSEchTbdwwvCo2RaFIq0cExE7qwJCy12NFhkRe9SGFe1t6mt0b8u16lmW62VPp0HeTbtztwdrINl/OmlZmICtBdro26OPBfw+ckj3xl20B6KzSLKtaD+amJ7u6n4+r3AuiKHKnVP/b/19fhJtsib7f2BzqSoeQTofz2XnqaYbw2MRpdl4xHB6b5OGZ/sta2hH6QehdYFFe6Sy6WeYwjcDGGS437RX0Jj+HnIKz1PMW/agok3qNs5i52kKOHATPeL9AzqbQvjNweOC5/b69/kPzcn0eVLm/fZ3F11bk/yQZpZ2ZLANMPmTuBBcbx1om/4QuUXIE/6HupXzfVYXA5jB0gxGfK3n5qYTGsSC8+9cPyyhswLB1K7b5gMWuZQY= 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)(376002)(39860400002)(346002)(366004)(136003)(396003)(86362001)(38070700005)(82960400001)(38100700002)(122000001)(186003)(9686003)(83380400001)(33656002)(26005)(71200400001)(107886003)(110136005)(53546011)(41300700001)(54906003)(316002)(7696005)(6506007)(966005)(478600001)(2906002)(5660300002)(52536014)(8676002)(8936002)(55016003)(66556008)(66476007)(4326008)(66446008)(76116006)(66946007)(64756008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?5/XIBSgMDb5Ag/M2NXS57MfTCeOYha1wJwUp6Eqa5Ps0iwtz+BRzGSTPG/Rn?= =?us-ascii?Q?Msf7HNfRpM56BPxhK9VkvI8hsSMFBAkZK0WCaVCpQy5G9I06RhzmzVJn6Jf8?= =?us-ascii?Q?zEFixktklX6ktGHaL9usPwVYhrCca1G/yH15UdJcBCEBr35GpznzoWukLkn2?= =?us-ascii?Q?+fTHrE8aL46ZWed8pz/+aytuSzTE/UoExJGfc2YgVd8uUuaQcidlAvZieuYz?= =?us-ascii?Q?vO13GFiFp3hsN7OJgWWbwor7fxhEh0uj114iha0dqR2ET9pzROvZAQRcOwoZ?= =?us-ascii?Q?kIuQCImGYChyQI51SX13oLu9JZ0xvcDVPW1x9Qc0y0cpdkLsFMJyiklwIIlB?= =?us-ascii?Q?bmWtsoUuZpvaGwxKL3eVyyAGO0CcJ64FV9VaOfe0XgPlnMMn+2NBVCOzDyBt?= =?us-ascii?Q?OzNKJkDdgqJ/81Wc+WQ8kHc9XQSVmdyLNbLF7HVl3CLRISNLtfR1cDV9aZKa?= =?us-ascii?Q?3ektomp7lxLL8nqcZHdOzE5GolPTM9uGrrxdOwI/ECj30dG79Z2BFqZLtJA5?= =?us-ascii?Q?E1+0af3h5h5FwHNbH0oueCunIU+86+U9XUYBf/h0adPEvMjA9c2uVTgztNVL?= =?us-ascii?Q?/fQjwwDEVsFFIKYWoEvolOj87AzxKVVNw6oeKgrVaP2uR7+V0nXRdpQfdR4I?= =?us-ascii?Q?ed0VOdBxTNIeQehwj8goPFJTTE3kB2F8dEm4/MhCLJ8pOPraYv2cFcNpmpG2?= =?us-ascii?Q?OKI9IopGESPf8FC9aIoZo5HlZs2IaS4GbA3SlbGRDaTP3RFbiYV5UvSBKD5l?= =?us-ascii?Q?thNitlsNJAaRNoBzkpm+6WHgg2g2Hv07HaVUpA/ECziQCkzxNFlAqROzSOeq?= =?us-ascii?Q?rhqyy7jVj2tM5GBdgBsbogxEt/ZBFBywhA+fVLXE9k49MPvF19jHysxlE7/k?= =?us-ascii?Q?1S4aSgd2yLJBSYlJpCoKge6ktoJneTMeN5hmo9iH6GYqrzrt34tfQ3SMBIrO?= =?us-ascii?Q?m163Yrn/aNahfrldKVeS8QnHuztmGt0IuiTJpl/Q2rJ55EMslbXaWjk0XM59?= =?us-ascii?Q?E5YEgdXd8FNLLfpjv85jbMwBwgVy6kr+X7xQyaiEpElrbk2y7HhNatrQuzdr?= =?us-ascii?Q?Sj5TAIcEWnsfwN+PBoo1A+FyhQcRNGqGJRl0N1XL6oKzUzVlZlPKS8dgtbXC?= =?us-ascii?Q?9gO6Mu2Ww/AyWg7u7EhVfSJWHP01Dj8x0RvbYbEhNDPQA44gmhe9F5MUXj3K?= =?us-ascii?Q?XJMEck7cwCi/hiC+mRC+wfQnAixbpbR1woYSlri7TqFGgRcHpyGkNMFMmh6M?= =?us-ascii?Q?lJJ3x1L5LzlM4pudAh42+AMs318KyVJbzDguaG7S8FgqUJKtPDTi5VDZOWFS?= =?us-ascii?Q?KlxdtH7uBCm5GPXo1FX24QCPetEVv/YiU9ahL37eZGZqbmls7BmeQcSFysYs?= =?us-ascii?Q?lULWyMUWEwWKGzrW2ltffJq8ME65DKFMwqkV9oSWOSvYrD82KP4uaG5MxpGB?= =?us-ascii?Q?Qfsb9d8XO9MvnybN5hzjkxvc+DHFed7nEs4R05/VSgW+Z7lMGrF7AYqHKEIF?= =?us-ascii?Q?hKJ1RWJNRBgLVzl+32VOdMbOld3Eg2p6CW1RXqQkdTGB5nKhKC+S7ER/8hZ7?= =?us-ascii?Q?/+3nC9KBJFa2wzJ9wDjv+AAt845p3RREKy76a638?= 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: 4ef9f34a-443c-439f-33f5-08da62d9e964 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jul 2022 01:08:48.9116 (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: iKUzI0U7YTI+9N+y5RAbpDechGlXXwzLKXWUUrWf3vI5HQYPDy2RHrwfN32kqjMB6ue8HRu01EqgVQHnYmgbKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1745 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: Chen, Christine =20 Sent: Thursday, June 30, 2022 5:04 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Gao, Liming ; Huang, Long1 ; Ni, Ray Subject: [PATCH 1/1] BaseTools: Fix DSC LibraryClass precedence rule REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3965 Currently DSC LibraryClass precedence rule is not align with DSC Spec. The expectation rule should be: [LibraryClasses.$(ARCH)] < [LibraryClasses.Common.$(MODULE_TYPE)] The actual behavior is: [LibraryClasses.$(ARCH)] > [LibraryClasses.Common.$(MODULE_TYPE)] This patch fixes the issue. Cc: Bob Feng Cc: Liming Gao Cc: Long1 Huang Cc: Ray Ni Signed-off-by: Yuwei Chen --- 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 a599c5bb7688..7a56b2b2e972 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[Arch, ModuleType, LibraryClass] =3D Libra= ryInstance + LibraryClassDict[ModuleType, Arch, 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[self._Arch, Modul= eType, LibraryClass] + LibraryInstance =3D LibraryClassDict[ModuleType, self.= _Arch, LibraryClass] if LibraryInstance is None: continue self._LibraryClasses[LibraryClass, ModuleType] =3D Lib= raryInstance --=20 2.26.1.windows.1