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.93; helo=mga11.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 A21B8209603CA for ; Tue, 22 May 2018 05:48:42 -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 fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2018 05:48:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,430,1520924400"; d="scan'208";a="226311363" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga005.jf.intel.com with ESMTP; 22 May 2018 05:48:41 -0700 Received: from fmsmsx101.amr.corp.intel.com (10.18.124.199) 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:48:41 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx101.amr.corp.intel.com (10.18.124.199) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 22 May 2018 05:48:41 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.240]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.6]) with mapi id 14.03.0319.002; Tue, 22 May 2018 20:48:39 +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+ysdEHYdbib6Q7okxQgAAQbGA= Date: Tue, 22 May 2018 12:48:38 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E22ED7C@SHSMSX104.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYTdiYWJhNTYtMDA3Zi00YWVmLTk3MDAtNzE2MGQ0YTg5MjBjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiamtTU2ZYWGJBRWZhNXp6MW1adHRGdU9YN2RqYkFERTdrQ2kwMnZZSGhJek1sdEpGRzF6UlJVOXRnR05SaDl6RSJ9 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:48:42 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Marvin: I don't see the whitespace in this patch. I also run BaseTools\Scripts\Pa= tchCheck.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 >=20 > This is odd. I generated another patch and checked for whitespace and CRL= F/LF changes and found everything to be fine. > Now V2 has the exact same whitespace change as V1. Also, if I see it righ= t, it failed to CC Yonghong even though the CMD clearly > shows the cc. >=20 > Is there maybe some git expert around who has an idea what the issue coul= d be? >=20 > Thanks, > Marvin >=20 > > -----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 tou= ple to > > two separate values, which was probably unintended and also breaks buil= d > > 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(nexts= kuid) > > 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.SkuOverrideV= alues[skuid]: > > stru_pcd.SkuOverrideValues[skuid][defaults= toreid] =3D > > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorena > > me]) > > - stru_pcd.ValueChain.add(skuid,defaultstore= id) > > + > > + 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