From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B14B4209603CA for ; Tue, 22 May 2018 05:52:17 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2018 05:52:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,430,1520924400"; d="scan'208";a="226312073" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga005.jf.intel.com with ESMTP; 22 May 2018 05:52:16 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 22 May 2018 05:52:16 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 22 May 2018 05:52:15 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.240]) by shsmsx102.ccr.corp.intel.com ([169.254.2.79]) with mapi id 14.03.0319.002; Tue, 22 May 2018 20:52:14 +0800 From: "Gao, Liming" To: "Marvin.Haeuser@outlook.com" , "edk2-devel@lists.01.org" Thread-Topic: [PATCH v2] BaseTools/Workspace: Fix ValueChain set Thread-Index: AQHT8cLNi6bjJKr2hE+ysdEHYdbib6Q7okxQgAAQbGCAAABhsIAAALQQ Date: Tue, 22 May 2018 12:52:13 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E22ED9C@SHSMSX104.ccr.corp.intel.com> References: <4A89E2EF3DFEDB4C8BFDE51014F606A14E22ED7C@SHSMSX104.ccr.corp.intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNjczNDVjNjMtOTMzYy00NTJiLTlhZTgtYjY5NzM1MDA0ODUxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiZ0tGczRIcWlVYWlHeXZLb0pUYW5FeWlCTndUMml4ZFRUQTBsK05DVGVUclJNeTZTbHlVSmlZT2lVNGtVeUZIVSJ9 dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 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:52:17 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Yes. I also check V1. It also pass patchchecker. > -----Original Message----- > From: Marvin H=E4user [mailto:Marvin.Haeuser@outlook.com] > Sent: Tuesday, May 22, 2018 8:51 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming ; Zhu, Yonghong > Subject: RE: [PATCH v2] BaseTools/Workspace: Fix ValueChain set >=20 > Thanks Liming! > Maybe this is an issue with my e-mail client or server, I just heard Exch= ange sometimes messes up. > If there really is no such change as I'm observing here, V1 should be fin= e too. >=20 > Regards, > Marvin. >=20 > > -----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 > > > > Marvin: > > I don't see the whitespace in this patch. I also run > > BaseTools\Scripts\PatchCheck.py. There is no issue found. > > > > > -----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= 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 > > > > > > > > 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(n= extskuid) > > > > 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 @@ clas= s > > > > DscBuildData(PlatformBuildClassObject): > > > > for defaultstoreid in DefaultStores: > > > > if defaultstoreid not in stru_pcd.SkuOverr= ideValues[skuid]: > > > > > > > > stru_pcd.SkuOverrideValues[skuid][defaultstoreid] =3D > > > > > > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstoren > > > > a > > > > me]) > > > > - stru_pcd.ValueChain.add(skuid,defaults= toreid) > > > > + > > > > + 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