From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a01:111:f400:fe08::816; helo=eur03-am5-obe.outbound.protection.outlook.com; envelope-from=marvin.haeuser@outlook.com; receiver=edk2-devel@lists.01.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03olkn0816.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::816]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4C514209603CA for ; Tue, 22 May 2018 05:51:04 -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=dE5oUs/d3G6Ij0lZnV5HhURWMQiEtmZlJfc6d7ttQuY=; b=EznV0GE/XPHeuuMdGXwruQ3pIcpaoH1UdnJryym0qOYEdpXNdnLIgvVZR7DVb8xbQRV8lQxDJ4Rt5zvWmknnV3Gcn6QMyzYSejney8YD9DslVlgFOE0pJ2oreau8EGXv/vjks5iNokOM/7L7JJHD1KQsc7MT6I7M1KgBogbPgcLi/izJwzaAO3KO/E57lEw8EE0KXD5a7OE5FO5daSyC0j52dDxpq0Am3GtstDCjbXcBJiIFb3Iput0MB+mCpYWfq5IrANMFvhNHywKtDlXVTrUwKSFmjPuofQhg6appUS213Up7HJjLXiNtULg3qwW3q4pPXto+Hr6rUu+viKO5mw== Received: from VE1EUR03FT023.eop-EUR03.prod.protection.outlook.com (10.152.18.58) by VE1EUR03HT083.eop-EUR03.prod.protection.outlook.com (10.152.19.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.18; Tue, 22 May 2018 12:51:01 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com (10.152.18.52) by VE1EUR03FT023.mail.protection.outlook.com (10.152.18.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.797.11 via Frontend Transport; Tue, 22 May 2018 12:51:01 +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 12:51:01 +0000 From: =?iso-8859-1?Q?Marvin_H=E4user?= To: "edk2-devel@lists.01.org" CC: "Gao, Liming" , "yonghong.zhu@intel.com" Thread-Topic: [PATCH v2] BaseTools/Workspace: Fix ValueChain set Thread-Index: AQHT8cLNi6bjJKr2hE+ysdEHYdbib6Q7okxQgAAQbGCAAABhsA== Date: Tue, 22 May 2018 12:51:01 +0000 Message-ID: References: <4A89E2EF3DFEDB4C8BFDE51014F606A14E22ED7C@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E22ED7C@SHSMSX104.ccr.corp.intel.com> Accept-Language: de-DE, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:1DEF4B6D72182A3ED7409F0E96750587BBC019D3F8E9D745FD5E73CB41CCB914; UpperCasedChecksum:83CCFAD3676BBA74DBFF9A3AC9D6F5E3724C02A18006370F1089E9FD058591BA; SizeAsReceived:7367; Count:46 x-tmn: [C5nuwm90zLmrKPyKx+n/JsDdT9NLn5Wb] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VE1EUR03HT083; 7:sCsx7ir8B+PAknoXYtKPqgTb9cE5vN4c7TnU6sW972dBhC94GPBmSeMcKT8XBOkJtQpQ6xjUgV0fIlPvNaKBkgyx+6uiO1GnfYLhXFWRXP5jMHRUaYRoP6U3j9Wzp6Buq+O4i+7r67jYTUCkAc3rk+G5kJAA2kNEZVNCEoSsAIqEwnjxBSpanYQOv8IUZiKETxGzT3Q+mvjHKx86JfCIbTC9KXe1ldHma1fm0fs8R9jQ6b2SYOPaRuWcSh+UqKbr 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:VE1EUR03HT083; x-ms-traffictypediagnostic: VE1EUR03HT083: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:VE1EUR03HT083; BCL:0; PCL:0; RULEID:; SRVR:VE1EUR03HT083; x-forefront-prvs: 0680FADD48 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(979002)(189003)(199004)(13464003)(82202002)(45080400002)(54906003)(72206003)(2900100001)(97736004)(966005)(105586002)(106356001)(20460500001)(229853002)(33656002)(5250100002)(2501003)(104016004)(87572001)(14454004)(25786009)(476003)(6916009)(446003)(426003)(11346002)(6306002)(486006)(6246003)(5660300001)(8936002)(81156014)(7696005)(3280700002)(8676002)(74316002)(99286004)(6346003)(102836004)(53546011)(26005)(76176011)(55016002)(3660700001)(6436002)(4326008)(86362001)(68736007)(5640700003)(305945005)(59450400001)(2351001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1901; SCL:1; SRVR:VE1EUR03HT083; 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: OzQAuE3/0ghmgxlsWq1lokcKzgoTTk2IHBXUVTE69Y1jj3xh3pa2F45UGz7vlK+FUz+i6Kj4jlzNVEZHy3ST9zZ0UKK/Lfd7DgAn4hGGDZcdrPydtiEvzCTEX/CsvfbJZ5d/zKbnkRvtxErUkYfm6L3UhOzAU2NeVpwa5FGjSw2Hs/U5jX79pnFUkPkF8EMq MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 41bd6d2b-1851-4c5a-f191-08d5bfe2ac47 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-Network-Message-Id: 41bd6d2b-1851-4c5a-f191-08d5bfe2ac47 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-originalarrivaltime: 22 May 2018 12:51:01.5922 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR03HT083 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 12:51:05 -0000 Content-Language: de-DE Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Thanks Liming! Maybe this is an issue with my e-mail client or server, I just heard Exchan= ge sometimes messes up. If there really is no such change as I'm observing here, V1 should be fine = too. Regards, Marvin. > -----Original Message----- > From: Gao, Liming > Sent: Tuesday, May 22, 2018 2:49 PM > To: Marvin.Haeuser@outlook.com; edk2-devel@lists.01.org > Cc: Zhu, Yonghong > Subject: RE: [PATCH v2] BaseTools/Workspace: Fix ValueChain set >=20 > Marvin: > I don't see the whitespace in this patch. I also run > BaseTools\Scripts\PatchCheck.py. There is no issue found. >=20 > > -----Original Message----- > > From: Marvin H=E4user [mailto:Marvin.Haeuser@outlook.com] > > Sent: Tuesday, May 22, 2018 7:52 PM > > To: edk2-devel@lists.01.org > > Cc: Gao, Liming ; Zhu, Yonghong > > > > Subject: RE: [PATCH v2] BaseTools/Workspace: Fix ValueChain set > > > > 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 c= c. > > > > 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 > > > > > > 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(nex= tskuid) > > > 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.SkuOverrid= eValues[skuid]: > > > > > > stru_pcd.SkuOverrideValues[skuid][defaultstoreid] =3D > > > > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstoren > > > a > > > me]) > > > - stru_pcd.ValueChain.add(skuid,defaultsto= reid) > > > + > > > + 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 > > > > > > _______________________________________________ > > > edk2-devel mailing list > > > edk2-devel@lists.01.org > > > https://lists.01.org/mailman/listinfo/edk2-devel