From: "Carsey, Jaben" <jaben.carsey@intel.com>
To: "Gao, Liming" <liming.gao@intel.com>,
"Marvin.Haeuser@outlook.com" <Marvin.Haeuser@outlook.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH v2] BaseTools/Workspace: Fix ValueChain set
Date: Tue, 22 May 2018 14:26:08 +0000 [thread overview]
Message-ID: <CB6E33457884FA40993F35157061515CA3D01968@FMSMSX103.amr.corp.intel.com> (raw)
In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E22ED9C@SHSMSX104.ccr.corp.intel.com>
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
prev parent reply other threads:[~2018-05-22 14:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CB6E33457884FA40993F35157061515CA3D01968@FMSMSX103.amr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox