* [PATCH v2] BaseTools/Workspace: Fix ValueChain set @ 2018-05-22 11:48 Marvin Häuser 2018-05-22 11:52 ` Marvin Häuser 0 siblings, 1 reply; 6+ messages in thread From: Marvin Häuser @ 2018-05-22 11:48 UTC (permalink / raw) To: edk2-devel@lists.01.org; +Cc: liming.gao@intel.com, yonghong.zhu@intel.com 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 <Marvin.Haeuser@outlook.com> --- 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 = self.SkuIdMgr.GetNextSkuId(nextskuid) stru_pcd.SkuOverrideValues[skuid] = 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 = skuid @@ -1366,7 +1366,7 @@ class DscBuildData(PlatformBuildClassObject): for defaultstoreid in DefaultStores: if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]: stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorename]) - stru_pcd.ValueChain.add(skuid,defaultstoreid) + stru_pcd.ValueChain.add((skuid,defaultstoreid)) S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set) Str_Pcd_Values = self.GenerateByteArrayValue(S_pcd_set) if Str_Pcd_Values: -- 2.17.0.windows.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] BaseTools/Workspace: Fix ValueChain set 2018-05-22 11:48 [PATCH v2] BaseTools/Workspace: Fix ValueChain set Marvin Häuser @ 2018-05-22 11:52 ` Marvin Häuser 2018-05-22 12:48 ` Gao, Liming 0 siblings, 1 reply; 6+ messages in thread From: Marvin Häuser @ 2018-05-22 11:52 UTC (permalink / raw) To: edk2-devel@lists.01.org; +Cc: liming.gao@intel.com, yonghong.zhu@intel.com 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 <edk2-devel-bounces@lists.01.org> On Behalf Of Marvin > Häuser > 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 <Marvin.Haeuser@outlook.com> > --- > 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 = self.SkuIdMgr.GetNextSkuId(nextskuid) > stru_pcd.SkuOverrideValues[skuid] = > 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 = skuid > @@ -1366,7 +1366,7 @@ class DscBuildData(PlatformBuildClassObject): > for defaultstoreid in DefaultStores: > if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]: > stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorena > me]) > - stru_pcd.ValueChain.add(skuid,defaultstoreid) > + > + stru_pcd.ValueChain.add((skuid,defaultstoreid)) > S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set) > Str_Pcd_Values = 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] BaseTools/Workspace: Fix ValueChain set 2018-05-22 11:52 ` Marvin Häuser @ 2018-05-22 12:48 ` Gao, Liming 2018-05-22 12:51 ` Marvin Häuser 0 siblings, 1 reply; 6+ messages in thread From: Gao, Liming @ 2018-05-22 12:48 UTC (permalink / raw) To: Marvin.Haeuser@outlook.com, edk2-devel@lists.01.org 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äuser [mailto:Marvin.Haeuser@outlook.com] > Sent: Tuesday, May 22, 2018 7:52 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com> > 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 <edk2-devel-bounces@lists.01.org> On Behalf Of Marvin > > Häuser > > 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 <Marvin.Haeuser@outlook.com> > > --- > > 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 = self.SkuIdMgr.GetNextSkuId(nextskuid) > > stru_pcd.SkuOverrideValues[skuid] = > > 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 = skuid > > @@ -1366,7 +1366,7 @@ class DscBuildData(PlatformBuildClassObject): > > for defaultstoreid in DefaultStores: > > if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]: > > stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = > > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorena > > me]) > > - stru_pcd.ValueChain.add(skuid,defaultstoreid) > > + > > + stru_pcd.ValueChain.add((skuid,defaultstoreid)) > > S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set) > > Str_Pcd_Values = 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] BaseTools/Workspace: Fix ValueChain set 2018-05-22 12:48 ` Gao, Liming @ 2018-05-22 12:51 ` Marvin Häuser 2018-05-22 12:52 ` Gao, Liming 0 siblings, 1 reply; 6+ messages in thread From: Marvin Häuser @ 2018-05-22 12:51 UTC (permalink / raw) To: edk2-devel@lists.01.org; +Cc: Gao, Liming, yonghong.zhu@intel.com Thanks Liming! Maybe this is an issue with my e-mail client or server, I just heard Exchange 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 <liming.gao@intel.com> > Sent: Tuesday, May 22, 2018 2:49 PM > To: Marvin.Haeuser@outlook.com; edk2-devel@lists.01.org > Cc: Zhu, Yonghong <yonghong.zhu@intel.com> > 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äuser [mailto:Marvin.Haeuser@outlook.com] > > Sent: Tuesday, May 22, 2018 7:52 PM > > To: edk2-devel@lists.01.org > > Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong > > <yonghong.zhu@intel.com> > > 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 <edk2-devel-bounces@lists.01.org> On Behalf Of > > > Marvin Häuser > > > 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 <Marvin.Haeuser@outlook.com> > > > --- > > > 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 = self.SkuIdMgr.GetNextSkuId(nextskuid) > > > stru_pcd.SkuOverrideValues[skuid] = > > > 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 = skuid @@ -1366,7 +1366,7 @@ class > > > DscBuildData(PlatformBuildClassObject): > > > for defaultstoreid in DefaultStores: > > > if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]: > > > > > > stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = > > > > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstoren > > > a > > > me]) > > > - stru_pcd.ValueChain.add(skuid,defaultstoreid) > > > + > > > + stru_pcd.ValueChain.add((skuid,defaultstoreid)) > > > S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set) > > > Str_Pcd_Values = 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] BaseTools/Workspace: Fix ValueChain set 2018-05-22 12:51 ` Marvin Häuser @ 2018-05-22 12:52 ` Gao, Liming 2018-05-22 14:26 ` Carsey, Jaben 0 siblings, 1 reply; 6+ messages in thread From: Gao, Liming @ 2018-05-22 12:52 UTC (permalink / raw) To: Marvin.Haeuser@outlook.com, edk2-devel@lists.01.org Yes. I also check V1. It also pass patchchecker. > -----Original Message----- > From: Marvin Häuser [mailto:Marvin.Haeuser@outlook.com] > Sent: Tuesday, May 22, 2018 8:51 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com> > Subject: RE: [PATCH v2] BaseTools/Workspace: Fix ValueChain set > > Thanks Liming! > Maybe this is an issue with my e-mail client or server, I just heard Exchange 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 <liming.gao@intel.com> > > Sent: Tuesday, May 22, 2018 2:49 PM > > To: Marvin.Haeuser@outlook.com; edk2-devel@lists.01.org > > Cc: Zhu, Yonghong <yonghong.zhu@intel.com> > > 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äuser [mailto:Marvin.Haeuser@outlook.com] > > > Sent: Tuesday, May 22, 2018 7:52 PM > > > To: edk2-devel@lists.01.org > > > Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong > > > <yonghong.zhu@intel.com> > > > 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 <edk2-devel-bounces@lists.01.org> On Behalf Of > > > > Marvin Häuser > > > > 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 <Marvin.Haeuser@outlook.com> > > > > --- > > > > 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 = self.SkuIdMgr.GetNextSkuId(nextskuid) > > > > stru_pcd.SkuOverrideValues[skuid] = > > > > 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 = skuid @@ -1366,7 +1366,7 @@ class > > > > DscBuildData(PlatformBuildClassObject): > > > > for defaultstoreid in DefaultStores: > > > > if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]: > > > > > > > > stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = > > > > > > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstoren > > > > a > > > > me]) > > > > - stru_pcd.ValueChain.add(skuid,defaultstoreid) > > > > + > > > > + stru_pcd.ValueChain.add((skuid,defaultstoreid)) > > > > S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set) > > > > Str_Pcd_Values = 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] BaseTools/Workspace: Fix ValueChain set 2018-05-22 12:52 ` Gao, Liming @ 2018-05-22 14:26 ` Carsey, Jaben 0 siblings, 0 replies; 6+ messages in thread From: Carsey, Jaben @ 2018-05-22 14:26 UTC (permalink / raw) To: Gao, Liming, Marvin.Haeuser@outlook.com, edk2-devel@lists.01.org Marvin, I have seen funny stuff when outlook shows me the email with patch, but it's part of the displaying not the sending bits... -Jaben > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Gao, Liming > Sent: Tuesday, May 22, 2018 5:52 AM > To: Marvin.Haeuser@outlook.com; edk2-devel@lists.01.org > Subject: Re: [edk2] [PATCH v2] BaseTools/Workspace: Fix ValueChain set > > Yes. I also check V1. It also pass patchchecker. > > > -----Original Message----- > > From: Marvin Häuser [mailto:Marvin.Haeuser@outlook.com] > > Sent: Tuesday, May 22, 2018 8:51 PM > > To: edk2-devel@lists.01.org > > Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong > <yonghong.zhu@intel.com> > > Subject: RE: [PATCH v2] BaseTools/Workspace: Fix ValueChain set > > > > Thanks Liming! > > Maybe this is an issue with my e-mail client or server, I just heard Exchange > 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 <liming.gao@intel.com> > > > Sent: Tuesday, May 22, 2018 2:49 PM > > > To: Marvin.Haeuser@outlook.com; edk2-devel@lists.01.org > > > Cc: Zhu, Yonghong <yonghong.zhu@intel.com> > > > 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äuser [mailto:Marvin.Haeuser@outlook.com] > > > > Sent: Tuesday, May 22, 2018 7:52 PM > > > > To: edk2-devel@lists.01.org > > > > Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong > > > > <yonghong.zhu@intel.com> > > > > 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 <edk2-devel-bounces@lists.01.org> On Behalf Of > > > > > Marvin Häuser > > > > > 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 <Marvin.Haeuser@outlook.com> > > > > > --- > > > > > 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 = self.SkuIdMgr.GetNextSkuId(nextskuid) > > > > > stru_pcd.SkuOverrideValues[skuid] = > > > > > 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 = skuid @@ -1366,7 +1366,7 @@ class > > > > > DscBuildData(PlatformBuildClassObject): > > > > > for defaultstoreid in DefaultStores: > > > > > if defaultstoreid not in > stru_pcd.SkuOverrideValues[skuid]: > > > > > > > > > > stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = > > > > > > > > > copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstoren > > > > > a > > > > > me]) > > > > > - stru_pcd.ValueChain.add(skuid,defaultstoreid) > > > > > + > > > > > + stru_pcd.ValueChain.add((skuid,defaultstoreid)) > > > > > S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set) > > > > > Str_Pcd_Values = 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 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-22 14:26 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-05-22 11:48 [PATCH v2] BaseTools/Workspace: Fix ValueChain set Marvin Häuser 2018-05-22 11:52 ` Marvin Häuser 2018-05-22 12:48 ` Gao, Liming 2018-05-22 12:51 ` Marvin Häuser 2018-05-22 12:52 ` Gao, Liming 2018-05-22 14:26 ` Carsey, Jaben
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox