* [PATCH openbmc 0/2] Update phosphor recipes to pickup latest code
@ 2016-02-02 4:10 OpenBMC Patches
2016-02-02 4:10 ` [PATCH openbmc 1/2] Update recipes OpenBMC Patches
2016-02-02 4:10 ` [PATCH openbmc 2/2] Update phosphor recipes to pickup latest code OpenBMC Patches
0 siblings, 2 replies; 6+ messages in thread
From: OpenBMC Patches @ 2016-02-02 4:10 UTC (permalink / raw)
To: openbmc
Update openbmc phosphor recipes to pickup latest functionality from
skeleton, ipmi, networkd, settings, etc.
https://github.com/openbmc/openbmc/pull/159
Adriana Kobylak (2):
Update recipes
Update phosphor recipes to pickup latest code
meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb | 2 +-
meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb | 2 +-
meta-phosphor/common/recipes-phosphor/network/network.bb | 2 +-
meta-phosphor/common/recipes-phosphor/settings/settings.bb | 2 +-
meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
--
2.6.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH openbmc 1/2] Update recipes
2016-02-02 4:10 [PATCH openbmc 0/2] Update phosphor recipes to pickup latest code OpenBMC Patches
@ 2016-02-02 4:10 ` OpenBMC Patches
2016-02-03 1:08 ` Cyril Bur
2016-02-02 4:10 ` [PATCH openbmc 2/2] Update phosphor recipes to pickup latest code OpenBMC Patches
1 sibling, 1 reply; 6+ messages in thread
From: OpenBMC Patches @ 2016-02-02 4:10 UTC (permalink / raw)
To: openbmc
From: Adriana Kobylak <anoo@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 = ""
S = "${WORKDIR}/git"
INSTALL_NAME = "ipmid"
--
2.6.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH openbmc 2/2] Update phosphor recipes to pickup latest code
2016-02-02 4:10 [PATCH openbmc 0/2] Update phosphor recipes to pickup latest code OpenBMC Patches
2016-02-02 4:10 ` [PATCH openbmc 1/2] Update recipes OpenBMC Patches
@ 2016-02-02 4:10 ` OpenBMC Patches
1 sibling, 0 replies; 6+ messages in thread
From: OpenBMC Patches @ 2016-02-02 4:10 UTC (permalink / raw)
To: openbmc
From: Adriana Kobylak <anoo@us.ibm.com>
Update openbmc phosphor recipes to pickup latest functionality from
skeleton, ipmi, networkd, settings, etc.
---
meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb | 2 +-
meta-phosphor/common/recipes-phosphor/network/network.bb | 2 +-
meta-phosphor/common/recipes-phosphor/settings/settings.bb | 2 +-
meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
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 068d395..e6527f6 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 = ""
+SRCREV = "83edabb0e05fd71d4905ef255e97f65d966c6e7e"
S = "${WORKDIR}/git"
INSTALL_NAME = "ipmid"
diff --git a/meta-phosphor/common/recipes-phosphor/network/network.bb b/meta-phosphor/common/recipes-phosphor/network/network.bb
index b53f7f4..6331678 100644
--- a/meta-phosphor/common/recipes-phosphor/network/network.bb
+++ b/meta-phosphor/common/recipes-phosphor/network/network.bb
@@ -12,7 +12,7 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd \
file://80-dhcp.network \
"
-SRCREV = "a657afc9cc76dc6678edb8de9df569f92dd108e1"
+SRCREV = "6b3d6af5b9c38d734f20e859394db275e141328e"
S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/settings/settings.bb b/meta-phosphor/common/recipes-phosphor/settings/settings.bb
index 1c5fe28..d1fa639 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/settings.bb
+++ b/meta-phosphor/common/recipes-phosphor/settings/settings.bb
@@ -10,7 +10,7 @@ RDEPENDS_${PN} += "python-dbus python-pygobject"
SRC_URI += "git://github.com/openbmc/phosphor-settingsd"
-SRCREV = "33e0930724c12f83ddf99f7452fc0551ac10ccfc"
+SRCREV = "3bda531d94f4c93473bbedd7d7e5c44d4d9da93b"
S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
index fab50ea..3cc91d6 100644
--- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
+++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
@@ -13,10 +13,10 @@ inherit obmc-phosphor-sensor-mgmt
inherit obmc-phosphor-system-mgmt
DEPENDS += "glib-2.0"
-RDEPENDS_${PN} += "python-subprocess python-tftpy"
+RDEPENDS_${PN} += "python-subprocess python-compression"
SRC_URI += "git://github.com/openbmc/skeleton"
-SRCREV = "abe4953f941f63b4a3f531af15f6dba68870f3a9"
+SRCREV = "695f5d12e33daece376ddf1f9c7041a5bd6a3c7d"
S = "${WORKDIR}"
--
2.6.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH openbmc 1/2] Update recipes
2016-02-02 4:10 ` [PATCH openbmc 1/2] Update recipes OpenBMC Patches
@ 2016-02-03 1:08 ` Cyril Bur
2016-02-03 1:28 ` Adriana Kobylak
[not found] ` <201602030128.u131SCvZ020249@d01av04.pok.ibm.com>
0 siblings, 2 replies; 6+ messages in thread
From: Cyril Bur @ 2016-02-03 1:08 UTC (permalink / raw)
To: OpenBMC Patches, anoo; +Cc: openbmc
On Mon, 1 Feb 2016 22:10:19 -0600
OpenBMC Patches <openbmc-patches@stwcx.xyz> wrote:
> From: Adriana Kobylak <anoo@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?
> S = "${WORKDIR}/git"
> INSTALL_NAME = "ipmid"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH openbmc 1/2] Update recipes
2016-02-03 1:08 ` Cyril Bur
@ 2016-02-03 1:28 ` Adriana Kobylak
[not found] ` <201602030128.u131SCvZ020249@d01av04.pok.ibm.com>
1 sibling, 0 replies; 6+ messages in thread
From: Adriana Kobylak @ 2016-02-03 1:28 UTC (permalink / raw)
To: Cyril Bur; +Cc: openbmc, OpenBMC Patches
[-- Attachment #1: Type: text/plain, Size: 2271 bytes --]
Cyril Bur <cyrilbur@gmail.com> wrote on 02/02/2016 07:08:41 PM:
> From: Cyril Bur <cyrilbur@gmail.com>
> To: OpenBMC Patches <openbmc-patches@stwcx.xyz>, Adriana Kobylak/
> Austin/IBM@IBMUS
> Cc: openbmc@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@stwcx.xyz> wrote:
>
> > From: Adriana Kobylak <anoo@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.
>
> > S = "${WORKDIR}/git"
> > INSTALL_NAME = "ipmid"
>
[-- Attachment #2: Type: text/html, Size: 3132 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH openbmc 1/2] Update recipes
[not found] ` <201602030128.u131SCvZ020249@d01av04.pok.ibm.com>
@ 2016-02-03 4:44 ` Cyril Bur
0 siblings, 0 replies; 6+ messages in thread
From: Cyril Bur @ 2016-02-03 4:44 UTC (permalink / raw)
To: Adriana Kobylak; +Cc: openbmc, OpenBMC Patches
On Tue, 2 Feb 2016 19:28:06 -0600
"Adriana Kobylak" <anoo@us.ibm.com> wrote:
> Cyril Bur <cyrilbur@gmail.com> wrote on 02/02/2016 07:08:41 PM:
>
> > From: Cyril Bur <cyrilbur@gmail.com>
> > To: OpenBMC Patches <openbmc-patches@stwcx.xyz>, Adriana Kobylak/
> > Austin/IBM@IBMUS
> > Cc: openbmc@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@stwcx.xyz> wrote:
> >
> > > From: Adriana Kobylak <anoo@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"
> >
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-03 4:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-02 4:10 [PATCH openbmc 0/2] Update phosphor recipes to pickup latest code OpenBMC Patches
2016-02-02 4:10 ` [PATCH openbmc 1/2] Update recipes OpenBMC Patches
2016-02-03 1:08 ` Cyril Bur
2016-02-03 1:28 ` Adriana Kobylak
[not found] ` <201602030128.u131SCvZ020249@d01av04.pok.ibm.com>
2016-02-03 4:44 ` Cyril Bur
2016-02-02 4:10 ` [PATCH openbmc 2/2] Update phosphor recipes to pickup latest code OpenBMC Patches
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.