diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-06-17 17:29:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 17:29:55 -0500 |
| commit | cddff4ad0d241420412c71196b190489d4ec57d0 (patch) | |
| tree | f9a0f4e428e361ae93d67ebadd823bc5c880206d | |
| parent | 99c5d4b811d081e598fe49682082852b8c56995f (diff) | |
| parent | b61dc0aed388e95733ea91951d9b404c7164281d (diff) | |
| download | talos-openbmc-cddff4ad0d241420412c71196b190489d4ec57d0.tar.gz talos-openbmc-cddff4ad0d241420412c71196b190489d4ec57d0.zip | |
Merge pull request #379 from anoo1/port
Remove rest-dbus from Barreleye
3 files changed, 11 insertions, 1 deletions
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 8799d8dd0..00209c1cf 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 +IMAGE_INSTALL_remove = "packagegroup-obmc-phosphor-apps-extrasdev" + diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index c715dedbf..d3960c737 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 21b4a2d80..25f346877 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", " \ |
