[PATCH openbmc 0/4] Refresh host-ipmid and install headers

[PATCH openbmc 0/4] Refresh host-ipmid and install headers

[OpenBMC Patches]

https://github.com/openbmc/openbmc/pull/17

Patrick Williams (4):
  Refactor sdbus-service.bbclass
  -systemd.bbclass incorrect for nativesdk packages
  phosphor-host-ipmid: refresh SRCREV
  rest-dbus: Remove redundant SYSTEMD variable

 meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass  |  1 -
 meta-phosphor/classes/obmc-phosphor-systemd.bbclass        |  6 +++---
 .../common/recipes-phosphor/host-ipmid/host-ipmid.bb       | 14 +++++++++-----
 .../obmc-phosphor-example-sdbus.bb                         |  1 +
 .../obmc-phosphor-fan/obmc-phosphor-fand.bb                |  1 +
 .../common/recipes-phosphor/rest-dbus/rest-dbus.bb         |  2 --
 6 files changed, 14 insertions(+), 11 deletions(-)

-- 
2.6.0

[PATCH openbmc 1/4] Refactor sdbus-service.bbclass

[OpenBMC Patches]

From: Patrick Williams <patrick@stwcx.xyz>

sdbus-service.bbclass currently depends on c-daemon.bbclass, which is
used for samples that have their code and makefiles in the repository.
Removed this inherit to make the sdbus-service class more generally
applicable.
---
 meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass                | 1 -
 .../obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb           | 1 +
 .../common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb      | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass b/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass
index 8a9853c..bc190d4 100644
--- a/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass
@@ -6,4 +6,3 @@ DEPENDS += "systemd"
 RDEPENDS_${PN} += "libsystemd"
 
 inherit obmc-phosphor-dbus-service
-inherit obmc-phosphor-c-daemon
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
index 3735007..89fbdb1 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
@@ -8,3 +8,4 @@ DBUS_SERVICES = " \
         "
 
 inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-c-daemon
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
index 13c4b70..79e2e6c 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
@@ -4,3 +4,4 @@ PR = "r1"
 
 inherit obmc-phosphor-fan-mgmt
 inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-c-daemon
-- 
2.6.0

[PATCH openbmc 2/4] -systemd.bbclass incorrect for nativesdk packages

[OpenBMC Patches]

From: Patrick Williams <patrick@stwcx.xyz>

We should use the 'bare' package name BPN instead of PN for finding the
service file.  Otherwise, a -nativesdk package cannot be created because
we get a file-not-found error on the service file.
---
 meta-phosphor/classes/obmc-phosphor-systemd.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
index 7bd2d9d..12e0bc1 100644
--- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
@@ -2,13 +2,13 @@
 
 inherit systemd
 
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
+SYSTEMD_SERVICE_${PN} = "${BPN}.service"
 SRC_URI += " \
-        file://${PN}.service \
+        file://${BPN}.service \
         "
 
 do_install_append() {
         # install systemd unit files
         install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system
 }
-- 
2.6.0

[PATCH openbmc 3/4] phosphor-host-ipmid: refresh SRCREV

[OpenBMC Patches]

From: Patrick Williams <patrick@stwcx.xyz>

Also required updating dependencies and installed files.
---
 .../common/recipes-phosphor/host-ipmid/host-ipmid.bb       | 14 +++++++++-----
 1 file changed, 9 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 9741e61..5e7ad64 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -4,17 +4,21 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid"
 PR = "r1"
 
 inherit obmc-phosphor-license
-inherit obmc-phosphor-systemd
+inherit obmc-phosphor-sdbus-service
 
-DEPENDS += "glib-2.0"
 SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
 
-SRCREV = "02d37aab090090af9a779f4039931a6721bff615"
+SRCREV = "98900a99254cd177c8308b63c341f793d2ac119d"
 
 S = "${WORKDIR}/git"
 
 do_install() {
-        install -m 0755 -d ${D}${sbindir} ${D}${libdir} ${D}${libdir}/host-ipmid/
+        install -m 0755 -d ${D}${sbindir}
         install -m 0755 ${S}/ipmid ${D}${sbindir}/
-        install -m 0755 ${S}/libapphandler.so ${D}${libdir}/host-ipmid/
+
+        install -m 0755 -d ${D}${libdir}/host-ipmid
+        install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
+
+        install -m 0755 -d ${D}${includedir}/host-ipmid
+        install -m 0644 ${S}/ipmid-api.h ${D}${includedir}/host-ipmid/
 }
-- 
2.6.0

[PATCH openbmc 4/4] rest-dbus: Remove redundant SYSTEMD variable

[OpenBMC Patches]

From: Patrick Williams <patrick@stwcx.xyz>

---
 meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
index e2b4719..e7e31cf 100644
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
@@ -7,8 +7,6 @@ inherit allarch
 inherit obmc-phosphor-license
 inherit obmc-phosphor-systemd
 
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
-
 RDEPENDS_${PN} += " \
         python-netserver \
         python-json \
-- 
2.6.0

Re: [PATCH openbmc 3/4] phosphor-host-ipmid: refresh SRCREV

[Joel Stanley]

On Fri, Oct 16, 2015 at 8:24 AM, OpenBMC Patches <patches@stwcx.xyz> wrote:
> From: Patrick Williams <patrick@stwcx.xyz>
>
> Also required updating dependencies and installed files.
> ---
>  .../common/recipes-phosphor/host-ipmid/host-ipmid.bb       | 14 +++++++++-----
>  1 file changed, 9 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 9741e61..5e7ad64 100644
> --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
> +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb

>  do_install() {
> -        install -m 0755 -d ${D}${sbindir} ${D}${libdir} ${D}${libdir}/host-ipmid/
> +        install -m 0755 -d ${D}${sbindir}
>          install -m 0755 ${S}/ipmid ${D}${sbindir}/
> -        install -m 0755 ${S}/libapphandler.so ${D}${libdir}/host-ipmid/
> +
> +        install -m 0755 -d ${D}${libdir}/host-ipmid
> +        install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
> +
> +        install -m 0755 -d ${D}${includedir}/host-ipmid
> +        install -m 0644 ${S}/ipmid-api.h ${D}${includedir}/host-ipmid/
>  }

Should we be putting install rules such as these in the makefile
instead? That way the programs are useful outside of the poky
buildsystem.

Re: [PATCH openbmc 3/4] phosphor-host-ipmid: refresh SRCREV

[Patrick Williams]

[-- Attachment #1: Type: text/plain, Size: 1635 bytes --]

On Fri, Oct 16, 2015 at 02:44:01PM +1030, Joel Stanley wrote:
> On Fri, Oct 16, 2015 at 8:24 AM, OpenBMC Patches <patches@stwcx.xyz> wrote:
> > From: Patrick Williams <patrick@stwcx.xyz>
> >
> > Also required updating dependencies and installed files.
> > ---
> >  .../common/recipes-phosphor/host-ipmid/host-ipmid.bb       | 14 +++++++++-----
> >  1 file changed, 9 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 9741e61..5e7ad64 100644
> > --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
> > +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
> 
> >  do_install() {
> > -        install -m 0755 -d ${D}${sbindir} ${D}${libdir} ${D}${libdir}/host-ipmid/
> > +        install -m 0755 -d ${D}${sbindir}
> >          install -m 0755 ${S}/ipmid ${D}${sbindir}/
> > -        install -m 0755 ${S}/libapphandler.so ${D}${libdir}/host-ipmid/
> > +
> > +        install -m 0755 -d ${D}${libdir}/host-ipmid
> > +        install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
> > +
> > +        install -m 0755 -d ${D}${includedir}/host-ipmid
> > +        install -m 0644 ${S}/ipmid-api.h ${D}${includedir}/host-ipmid/
> >  }
> 
> Should we be putting install rules such as these in the makefile
> instead? That way the programs are useful outside of the poky
> buildsystem.

Good point.  I will add a 'make install' to the makefile in the ipmid
package and then refactor this recipe with a follow up commit.

-- 
Patrick Williams

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]