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.43; helo=mga05.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 4EF3D21B02845 for ; Tue, 22 May 2018 04:22:24 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2018 04:22:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,430,1520924400"; d="scan'208";a="48916685" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga002.fm.intel.com with ESMTP; 22 May 2018 04:22:23 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 22 May 2018 04:22:23 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 22 May 2018 04:22:23 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.210]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.240]) with mapi id 14.03.0319.002; Tue, 22 May 2018 19:22:21 +0800 From: "Zhu, Yonghong" To: "Marvin.Haeuser@outlook.com" , "edk2-devel@lists.01.org" CC: "Carsey, Jaben" , "Gao, Liming" , "Zhu, Yonghong" Thread-Topic: [PATCH] BaseTools/Workspace: Fix ValueChain set Thread-Index: AQHT7vmdMiu5Nl+8DkWkXeAtQCpjQ6Q2yPfQgATW51A= Date: Tue, 22 May 2018 11:22:19 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 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: Tue, 22 May 2018 11:22:24 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable The patch looks good. Please send V2 to remove the space change. Thanks. Best Regards, Zhu Yonghong -----Original Message----- From: Marvin H=E4user [mailto:Marvin.Haeuser@outlook.com]=20 Sent: Saturday, May 19, 2018 5:28 PM To: edk2-devel@lists.01.org Cc: Carsey, Jaben ; Gao, Liming ; Zhu, Yonghong Subject: RE: [PATCH] BaseTools/Workspace: Fix ValueChain set 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=20 > 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=20 > from a dict to a set, but also changed the (former) key type from a=20 > touple to two separate values, which was probably unintended and also=20 > breaks build for packages involving Structured PCDs, because add()=20 > 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=20 > else copy.deepcopy({defaultstorename: stru_pcd.DefaultValues for=20 > 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=20 > DscBuildData(PlatformBuildClassObject): > for defaultstoreid in DefaultStores: > if defaultstoreid not in stru_pcd.SkuOverrideVal= ues[skuid]: > =20 > stru_pcd.SkuOverrideValues[skuid][defaultstoreid] =3D=20 > 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