From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.92.68.44; helo=eur02-he1-obe.outbound.protection.outlook.com; envelope-from=marvin.haeuser@outlook.com; receiver=edk2-devel@lists.01.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068044.outbound.protection.outlook.com [40.92.68.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 50D262034863B for ; Tue, 22 May 2018 04:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lC5lK9SiSb1z5wTM6+jNYGd3sOVxy9G7CJ6TJRPC+0U=; b=WanD8DM+HP5uo1ZLd1++iyXXNR0Z9W46YES0XnEcews7tM1GxQdegKgmj/Ow4xgVIeYYiYZUEfIcDa2xz0jPrMU5R5TUOPISBlij7r8ajF5zAgaifEAbYXRSk8wjG9l6WgJ5/TDY7D77qhygxPQ8dQ7oAixC6qnDMEfBwNpnwy7Lgc1v36nzwRSFrk+YZ+UBi65eP/sRJgAyaZBbnNDFwPc9u8PgcUclPlNf9UDcGK3PJqVWBS4uUbPWQjweweMJ/pBzT4oI/2lZpHww3tcavhNwxqFsKq3dge1XCwPQ4hFv40JtFjTkTo9ckWiR15dj/jh73rA6kPU7MVB1YPAvFw== Received: from AM5EUR02FT048.eop-EUR02.prod.protection.outlook.com (10.152.8.60) by AM5EUR02HT028.eop-EUR02.prod.protection.outlook.com (10.152.9.253) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.735.16; Tue, 22 May 2018 11:48:30 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com (10.152.8.53) by AM5EUR02FT048.mail.protection.outlook.com (10.152.9.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.776.18 via Frontend Transport; Tue, 22 May 2018 11:48:30 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com ([fe80::7010:5d5e:8dcf:d92e]) by VI1PR0801MB1790.eurprd08.prod.outlook.com ([fe80::7010:5d5e:8dcf:d92e%17]) with mapi id 15.20.0776.015; Tue, 22 May 2018 11:48:30 +0000 From: =?iso-8859-1?Q?Marvin_H=E4user?= To: "edk2-devel@lists.01.org" CC: "liming.gao@intel.com" , "yonghong.zhu@intel.com" Thread-Topic: [PATCH v2] BaseTools/Workspace: Fix ValueChain set Thread-Index: AQHT8cLNi6bjJKr2hE+ysdEHYdbibw== Date: Tue, 22 May 2018 11:48:29 +0000 Message-ID: Accept-Language: de-DE, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR0502CA0018.eurprd05.prod.outlook.com (2603:10a6:209:1::31) To VI1PR0801MB1790.eurprd08.prod.outlook.com (2603:10a6:800:5b::15) x-incomingtopheadermarker: OriginalChecksum:04C0FFDEBDEE9073B0D41464E84782ACFE48AD18DEF70267E89421B2B438A5BA; UpperCasedChecksum:E455EAFD7AAD66BD1B3C84C4163D36612470D904C7F3634D152C94B21EC86321; SizeAsReceived:7469; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [xP41bwwYY8pfWNLG8b5CKGrn3WEnNkyq] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM5EUR02HT028; 7:5vY+JpAgk1Y50P5igISxEywb6prbtjbXwv5C8C7Rbr80pzlAI6IepBxbEqmP2HMvamDxpXJLLZt0C7QEE2uRiRHrCg6FQhwtDxm1APMAWVTGPCRPr0CONPvOt0iCtWEqOtakMPWI6JtawSD7uABTDeOj0J3TbsnVtPuv+lQTaiqA5k/5mkYfC+MCaeKN9BCrc1tbeIU+xhJcQd6JDcQd6ucP3iyn7rmNniV1A+izvefg0z6WGhQ0y0wN4liM3Idw x-incomingheadercount: 48 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125466)(1603101448)(1701031045); SRVR:AM5EUR02HT028; x-ms-traffictypediagnostic: AM5EUR02HT028: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:AM5EUR02HT028; BCL:0; PCL:0; RULEID:; SRVR:AM5EUR02HT028; x-forefront-prvs: 0680FADD48 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(189003)(199004)(3280700002)(25786009)(105586002)(68736007)(2900100001)(104016004)(33656002)(97736004)(106356001)(8936002)(4326008)(5640700003)(55016002)(86362001)(87572001)(72206003)(476003)(486006)(3660700001)(20460500001)(14454004)(426003)(82202002)(305945005)(6436002)(6916009)(54906003)(26005)(74316002)(5660300001)(102836004)(7696005)(2351001)(386003)(99286004)(6346003)(8676002)(81156014)(5250100002)(2501003); DIR:OUT; SFP:1901; SCL:1; SRVR:AM5EUR02HT028; H:VI1PR0801MB1790.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:; received-spf: None (protection.outlook.com: outlook.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Marvin.Haeuser@outlook.com; x-microsoft-antispam-message-info: R6jm6ORjkB7RceydmoE7Rk7wOIb5IM7No6M3JIAPkKi5uw4vwhjJQROIKmvSqZdHE7WSX0p2+SY0eM+p5+bTPZLDeUKae1HierO4DAdKBM0leHUfyWC1NBXtJiTFpKS7KitGHWVoAfTZdsI/5253OVw9JRCAdO3sxs0qtPXZ9usrfFFaLgJXjBvAuKp72QTh MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 8e23b91b-85d3-46f3-8061-08d5bfd9efb0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-Network-Message-Id: 8e23b91b-85d3-46f3-8061-08d5bfd9efb0 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-originalarrivaltime: 22 May 2018 11:48:30.0267 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR02HT028 Subject: [PATCH v2] BaseTools/Workspace: Fix ValueChain set X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2018 11:48:34 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Commit 88252a90d1ca7846731cd2e4e8e860454f7d97a3 changed ValueChain from a dict to a set, but also changed the (former) key type from a touple to two separate values, which was probably unintended and also breaks build for packages involving Structured PCDs, because add() only takes one argument. This commit changes the values back to touples. V2: - Removed a whitespace change. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marvin Haeuser --- 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 8476543c5352..0262a91ed855 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1347,7 +1347,7 @@ class DscBuildData(PlatformBuildClassObject): nextskuid =3D self.SkuIdMgr.GetNextSkuId(nextskuid= ) stru_pcd.SkuOverrideValues[skuid] =3D copy.deepcopy(st= ru_pcd.SkuOverrideValues[nextskuid]) if not NoDefault else copy.deepcopy({d= efaultstorename: stru_pcd.DefaultValues for defaultstorename in DefaultStor= es} if DefaultStores else {TAB_DEFAULT_STORES_DEFAULT:stru_pcd.DefaultValue= s}) if not NoDefault: - stru_pcd.ValueChain.add(skuid,'') + stru_pcd.ValueChain.add((skuid,'')) if stru_pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_= HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]: for skuid in SkuIds: nextskuid =3D skuid @@ -1366,7 +1366,7 @@ class DscBuildData(PlatformBuildClassObject): for defaultstoreid in DefaultStores: if defaultstoreid not in stru_pcd.SkuOverrideValue= s[skuid]: stru_pcd.SkuOverrideValues[skuid][defaultstore= id] =3D copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstore= name]) - stru_pcd.ValueChain.add(skuid,defaultstoreid) + stru_pcd.ValueChain.add((skuid,defaultstoreid)= ) S_pcd_set =3D DscBuildData.OverrideByFdfComm(S_pcd_set) Str_Pcd_Values =3D self.GenerateByteArrayValue(S_pcd_set) if Str_Pcd_Values: --=20 2.17.0.windows.1