From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.92.73.63; helo=eur04-he1-obe.outbound.protection.outlook.com; envelope-from=marvin.haeuser@outlook.com; receiver=edk2-devel@lists.01.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (unknown [40.92.73.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C216A2096AEFD for ; Sat, 19 May 2018 02:28:08 -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=XiqEC6EL56SYLvbvE0vhK+RtgkIS3+FaiekWhLoGjv8=; b=tqf6MvgN5rB3AXnH7fzSs9kIKR85Ed2VaWmreb5V1D6BfVUuSfLUAj2GPDrq9J/Ua0vt2LBTRyk1V7cS51Yt8bSp2jSdk3m34i27HpBU2XAZJc/keenhjeozT5Rpb1MZ9bHTsJ9SaggdKOUDuifUY/egNaVb16PXsKEEErGbLdYDpoviRPLBn0Id46nh118YBTTlKEaDimokdfICGH+OinlGFop/bDqKoUyQY+WNXXiKbhGAlChW247ADCjNFwZ4i+1SIdK9a5YKgq4PHLOt/9QHXqJroOxoVUgUr9QBiHRpLzJYqvSFrilSOGHg5VhNmS2uR7/HjE0EpTaNKGgQlg== Received: from HE1EUR04FT039.eop-eur04.prod.protection.outlook.com (10.152.26.54) by HE1EUR04HT108.eop-eur04.prod.protection.outlook.com (10.152.26.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.755.15; Sat, 19 May 2018 09:28:00 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com (10.152.26.51) by HE1EUR04FT039.mail.protection.outlook.com (10.152.26.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.776.10 via Frontend Transport; Sat, 19 May 2018 09:28:00 +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.010; Sat, 19 May 2018 09:28:00 +0000 From: =?iso-8859-1?Q?Marvin_H=E4user?= To: "edk2-devel@lists.01.org" CC: "jaben.carsey@intel.com" , "liming.gao@intel.com" , "yonghong.zhu@intel.com" Thread-Topic: [PATCH] BaseTools/Workspace: Fix ValueChain set Thread-Index: AQHT7vmdMiu5Nl+8DkWkXeAtQCpjQ6Q2yPfQ Date: Sat, 19 May 2018 09:28:00 +0000 Message-ID: References: In-Reply-To: Accept-Language: de-DE, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:8045B7D1F209D4F2F07BE7B1455EF387C31F9E4F6118F57E62799AF9EF9C4900; UpperCasedChecksum:F067B66F286A6D060F0CAA40E5E6C88EE0136194495A41E39FEE5AE821D0F129; SizeAsReceived:7249; Count:46 x-tmn: [qBMfiIfjgKbxrCtJU44T+L39KN+I3mII] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR04HT108; 7:OEPHRqLGa+KSI+i1DYfcx2NQ7WQIewVuJxMW5w9L3burMloeoyHLaJSXkWwKF+9OIwKfjG0H6MCJB9HGUnzvPfFIEr02gbrhOp78/HwdBuPkq08+v6uSVN5OgJikPN7SKwuM8BO6Zc1S3OLpJoSzrpboA/tculBZO0CXdqrB6yxmN1G6VGoFrBCqrLm0gDJWMg+d1fHiwFC11ONWnA9vR11ivnvg9snLKXw4WBG5kDwTB8LegxVlGK8L9vu8tGyV x-incomingheadercount: 46 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:HE1EUR04HT108; x-ms-traffictypediagnostic: HE1EUR04HT108: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:HE1EUR04HT108; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR04HT108; x-forefront-prvs: 0677FFABBF x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(189003)(199004)(13464003)(14454004)(106356001)(99286004)(7696005)(5250100002)(105586002)(5660300001)(76176011)(229853002)(6436002)(5640700003)(82202002)(20460500001)(6916009)(2501003)(2900100001)(966005)(102836004)(72206003)(3660700001)(86362001)(53546011)(3280700002)(305945005)(55016002)(68736007)(6306002)(74316002)(476003)(446003)(486006)(104016004)(54906003)(6246003)(8676002)(426003)(11346002)(25786009)(97736004)(8936002)(87572001)(2351001)(26005)(33656002)(6346003)(81156014)(4326008); DIR:OUT; SFP:1901; SCL:1; SRVR:HE1EUR04HT108; 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: SWWABQLWABMciz8aU4nFTTAueL8QPvtwBmKSFhrF0inJun6UcbQ/2ESZjjpUbSF3LfOHaVMtILRV7W3ctdfdoKNsc9XTEe1LFkR8LQaMVV6Hl1p7q5sRb1YxMvhs0nprdvCw7eebkEdsK7xJa7WxVKo/Y4TbKOA3Jj640Kn2683ool5x79yzjcYleXO0DHkL MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 43ac5471-f41f-4d42-72e4-08d5bd6ad0b9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-Network-Message-Id: 43ac5471-f41f-4d42-72e4-08d5bd6ad0b9 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-originalarrivaltime: 19 May 2018 09:28:00.8165 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT108 Subject: Re: [PATCH] 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: Sat, 19 May 2018 09:28:09 -0000 Content-Language: de-DE Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sorry, it seems like my IDE did whitespace changes for the second change. I will submit a V2 once the functionality has been reviewed. > -----Original Message----- > From: edk2-devel On Behalf Of Marvin > H=E4user > Sent: Saturday, May 19, 2018 12:43 AM > To: edk2-devel@lists.01.org > Cc: jaben.carsey@intel.com; liming.gao@intel.com > Subject: [edk2] [PATCH] BaseTools/Workspace: Fix ValueChain set >=20 > Commit 88252a90d1ca7846731cd2e4e8e860454f7d97a3 changed ValueChain > from a dict to a set, but also changed the (former) key type from a toupl= e 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. >=20 > 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(-) >=20 > 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(nextsku= id) > stru_pcd.SkuOverrideValues[skuid] =3D > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid]) if not NoDefault > else copy.deepcopy({defaultstorename: stru_pcd.DefaultValues for > defaultstorename in DefaultStores} if DefaultStores else > {TAB_DEFAULT_STORES_DEFAULT:stru_pcd.DefaultValues}) > 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.SkuOverrideVal= ues[skuid]: > stru_pcd.SkuOverrideValues[skuid][defaultsto= reid] =3D > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorena > me]) > - 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: > -- > 2.17.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel