[PATCH openbmc 1/2] Update recipes

Cyril Bur cyrilbur at gmail.com
Wed Feb 3 15:44:33 AEDT 2016


On Tue, 2 Feb 2016 19:28:06 -0600
"Adriana Kobylak" <anoo at us.ibm.com> wrote:

> Cyril Bur <cyrilbur at gmail.com> wrote on 02/02/2016 07:08:41 PM:
> 
> > From: Cyril Bur <cyrilbur at gmail.com>
> > To: OpenBMC Patches <openbmc-patches at stwcx.xyz>, Adriana Kobylak/
> > Austin/IBM at IBMUS
> > Cc: openbmc at lists.ozlabs.org
> > Date: 02/02/2016 07:08 PM
> > Subject: Re: [PATCH openbmc 1/2] Update recipes
> > 
> > On Mon,  1 Feb 2016 22:10:19 -0600
> > OpenBMC Patches <openbmc-patches at stwcx.xyz> wrote:
> >   
> > > From: Adriana Kobylak <anoo at us.ibm.com>
> > > 
> > > ---
> > >  meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb |   
> 2 +-
> > >  meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb     |   
> 2 +-
> > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/  
> > host-ipmid-fru.bb b/meta-phosphor/common/recipes-phosphor/host-
> > ipmid/host-ipmid-fru.bb  
> > > index 5eed1f4..06ee00e 100644
> > > ---   
> a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
> > > +++   
> b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
> > > @@ -18,7 +18,7 @@ TARGET_CFLAGS += " -fpic -std=gnu++14"
> > > 
> > >  SRC_URI += "git://github.com/openbmc/ipmi-fru-parser"
> > > 
> > > -SRCREV = "63696f4b23c9fd0a84ce539a6414ada406aaf229"
> > > +SRCREV = "a14239a201443222906864273449a39cfa84118e"
> > > 
> > >  FILES_${PN} += "${libdir}/host-ipmid/*.so"
> > >  FILES_${PN}-dbg += "${libdir}/host-ipmid/.debug"
> > > diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/  
> > host-ipmid.bb   
> b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
> > > index e74a6de..068d395 100644
> > > --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
> > > +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
> > > @@ -18,7 +18,7 @@ RDEPENDS_${PN} += "settings"
> > >  RDEPENDS_${PN} += "network"
> > >  SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
> > > 
> > > -SRCREV = "e90d8bf6a342649dba2fd1589a3cddb3cd051bb1"
> > > +SRCREV = ""
> > >   
> > 
> > Does this not break the build?  
> 
> I inadvertently created 2 commits instead of amending the same one, making 
> the first commit an "intermediate" one with incomplete work, and the 2nd 
> commit the completed work.

You know this is something you can fix right? The public git repo doesn't need
to reflect your workflow... lets try to be tidy.

Sounds like what you might want to investigate is the `git rebase` command?

> >   
> > >  S = "${WORKDIR}/git"
> > >  INSTALL_NAME = "ipmid"  
> >   
> 
> 



More information about the openbmc mailing list