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.106; 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-oln040092068106.outbound.protection.outlook.com [40.92.68.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AF1B42034863B for ; Tue, 22 May 2018 04:52:30 -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=g0fNpEXArmZUvP7M58Sh5xELtSkzwN0T42NoWVZujy4=; b=konqI9GcRb6GLCvt5+D8bwg/9mOCdEGuvDj0b7s2eOQvhyqsNsH5wd1k0ECXYvEtrTMNcIM8MrlQvKwesMh1sYL+0ZD174AmtkvVfzXZH9cofnjLvWuAwVPPsjCIsDYP+fKgS0KspRR070j9S43GFwLXFvai/oYG/PqlzWY53h0ihi8/M3CffsPySBwrOX7/xVCNwN4JDVdJZIGDy2yEgUg/5hI5I9VEWQXHHTMPaQPb2dX6k4ecQks2qThjpItlnfObHbldAxwPHBojlJvaPtnTMLgnc4RHMJ9GxG5SE+6YfVtqQQt+/8O0ZPDMUQxAnddaBqyvaFyRBtXJ3MrAlQ== Received: from AM5EUR02FT048.eop-EUR02.prod.protection.outlook.com (10.152.8.52) by AM5EUR02HT152.eop-EUR02.prod.protection.outlook.com (10.152.9.225) 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:52:27 +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:52:27 +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:52:27 +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+ysdEHYdbib6Q7okxQ Date: Tue, 22 May 2018 11:52:27 +0000 Message-ID: References: In-Reply-To: Accept-Language: de-DE, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:3D282203D3D3E1CC4394EB175D6056596314F2D6E9A11B08C68FFB30943C27AC; UpperCasedChecksum:AC268F0932387C60B671CA26D013730ED05FB2E22D6D16067F23E83A4A63EEA9; SizeAsReceived:7212; Count:46 x-tmn: [bOABCrVRwz98lYGo8PHVFyzYTFo/phQ7] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM5EUR02HT152; 7:Yq4dStrvc1AbDFt4jrFuzrP7+u6rr6ilM15ioYRiOttQYKtEl8tGohiZBhqW3jJBFVWbahrszyhp45+7NlwCxU/tgtFfeojVG9iwTiG/+0kfzmTQYty4qXTc0Q5QKmosZgNhSkz1TvrPPveJYKwASH9MGtSFcchBjONBl2v7alSMXiIBWsk6GkENTq/nzuCi1O1Mr2wOo2S617Ni+A8W/9MAT8sL40X1pmAZ6cJ3LguyEFpQn1xGVgUxZ5D1YeO2 x-incomingheadercount: 46 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125466)(1701031045); SRVR:AM5EUR02HT152; x-ms-traffictypediagnostic: AM5EUR02HT152: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:AM5EUR02HT152; BCL:0; PCL:0; RULEID:; SRVR:AM5EUR02HT152; x-forefront-prvs: 0680FADD48 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(189003)(199004)(13464003)(72206003)(4326008)(104016004)(2940100002)(74316002)(25786009)(14454004)(966005)(2900100001)(87572001)(97736004)(2501003)(6246003)(5250100002)(2351001)(5640700003)(55016002)(99286004)(6306002)(7696005)(6916009)(76176011)(6436002)(8676002)(229853002)(54906003)(476003)(68736007)(81156014)(6346003)(102836004)(53546011)(3660700001)(26005)(446003)(86362001)(20460500001)(8936002)(82202002)(426003)(5660300001)(486006)(105586002)(106356001)(305945005)(11346002)(3280700002)(33656002); DIR:OUT; SFP:1901; SCL:1; SRVR:AM5EUR02HT152; 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: eVRkB8+HOfSH001gFFgUWdFc/0zoeU5SRPK5ZkueQf4q8qFtlwCZJfXAxVcM26OcdRfXOge9Y8IVLF6fB34b8pvvIFZJvR7LutBMFMZIkDsZPD8VNRBFGM4A8N33EBrBxdkiW8uTV2dOkBC0SV95Sk2FMBD9fhQAmO+UPq/whXeguMCC+2jW5tOn1aJ0nEBc MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c82fb1da-f4d6-496f-129e-08d5bfda7d70 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-Network-Message-Id: c82fb1da-f4d6-496f-129e-08d5bfda7d70 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-originalarrivaltime: 22 May 2018 11:52:27.0440 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR02HT152 Subject: Re: [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:52:31 -0000 Content-Language: de-DE Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable This is odd. I generated another patch and checked for whitespace and CRLF/= LF changes and found everything to be fine. Now V2 has the exact same whitespace change as V1. Also, if I see it right,= it failed to CC Yonghong even though the CMD clearly shows the cc. Is there maybe some git expert around who has an idea what the issue could = be? Thanks, Marvin > -----Original Message----- > From: edk2-devel On Behalf Of Marvin > H=E4user > Sent: Tuesday, May 22, 2018 1:48 PM > To: edk2-devel@lists.01.org > Cc: liming.gao@intel.com > Subject: [edk2] [PATCH v2] 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 > V2: > - Removed a whitespace change. >=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