[PATCH openbmc 0/2] Remove rest-dbus from Barreleye

[PATCH openbmc 0/2] Remove rest-dbus from Barreleye

[OpenBMC Patches]

Remove the rest-dbus development debug package from Barreleye now that Barreleye is going into production.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/openbmc/openbmc/379)
<!-- Reviewable:end -->


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

Adriana Kobylak (2):
  Move rest-dbus to development package
  Remove rest-dbus from Barreleye image

 .../meta-rackspace/meta-barreleye/conf/local.conf.sample           | 4 ++++
 meta-phosphor/classes/obmc-phosphor-image.bbclass                  | 1 +
 .../packagegroups/packagegroup-obmc-phosphor-apps.bb               | 7 ++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

-- 
2.8.4

[PATCH openbmc 1/2] Move rest-dbus to development package

[OpenBMC Patches]

From: Adriana Kobylak <anoo@us.ibm.com>

The rest-dbus package is a lightweight REST interface intended
for development debug. Classify it as a dev package so that it
is easy to remove from production images.

Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
---
 meta-phosphor/classes/obmc-phosphor-image.bbclass                  | 1 +
 .../packagegroups/packagegroup-obmc-phosphor-apps.bb               | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index c715ded..d3960c7 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -38,6 +38,7 @@ IMAGE_FEATURES += " \
 
 CORE_IMAGE_EXTRA_INSTALL_append = " bash \
         packagegroup-obmc-phosphor-apps-extras \
+        packagegroup-obmc-phosphor-apps-extrasdev \
         i2c-tools \
         screen \
         inarp \
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
index 21b4a2d..25f3468 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
+++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
@@ -13,6 +13,7 @@ VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl ?= "virtual/obmc-phosphor-flash-ctl"
 PROVIDES = "${PACKAGES}"
 PACKAGES = " \
         packagegroup-obmc-phosphor-apps-extras \
+        packagegroup-obmc-phosphor-apps-extrasdev \
         ${@mf_enabled("obmc-phosphor-fan-mgmt", "packagegroup-obmc-phosphor-apps-fan-mgmt", d)} \
         ${@mf_enabled("obmc-phosphor-chassis-mgmt", "packagegroup-obmc-phosphor-apps-chassis-mgmt", d)} \
         ${@mf_enabled("obmc-phosphor-sensor-mgmt", "packagegroup-obmc-phosphor-apps-sensor-mgmt", d)} \
@@ -25,11 +26,15 @@ PACKAGES = " \
 
 SUMMARY_packagegroup-obmc-phosphor-apps-extras = "Extra features"
 RDEPENDS_packagegroup-obmc-phosphor-apps-extras = " \
-        rest-dbus \
 	obmc-rest \
         host-ipmid \
         "
 
+SUMMARY_packagegroup-obmc-phosphor-apps-extrasdev = "Development features"
+RDEPENDS_packagegroup-obmc-phosphor-apps-extrasdev = " \
+        rest-dbus \
+        "
+
 SUMMARY_packagegroup-obmc-phosphor-apps-fan-mgmt = "Fan management support"
 RDEPENDS_packagegroup-obmc-phosphor-apps-fan-mgmt = \
         "${@cf_enabled("obmc-phosphor-fan-mgmt", " \
-- 
2.8.4

[PATCH openbmc 2/2] Remove rest-dbus from Barreleye image

[OpenBMC Patches]

From: Adriana Kobylak <anoo@us.ibm.com>

The rest-dbus is a package intended for development debug. Remove it
from the Barreleye image now that Barreleye is entering production.
The rest-dbus packages in part of the development package.

Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
---
 .../meta-rackspace/meta-barreleye/conf/local.conf.sample              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
index 8799d8d..07e7fef 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
@@ -243,3 +243,7 @@ INHERIT += "extrausers"
 EXTRA_USERS_PARAMS = " \
   usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
   "
+
+# Package exclusions - Exclude packages included by default in the common image
+PACKAGE_INSTALL_remove = "packagegroup-obmc-phosphor-apps-extrasdev"
+
-- 
2.8.4