diff options
| author | Benjamin Fair <benjaminfair@google.com> | 2020-04-14 06:07:28 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-17 20:34:43 +0300 |
| commit | 9b3a0dbd33b7ac077daf567db2efa53fad3caa9f (patch) | |
| tree | 57e61e62bd27692c6e10dd46b8efa915298874ce /meta-quanta | |
| parent | c15cd87eeef5da388ae24d188f0005c3320812a4 (diff) | |
| download | openbmc-9b3a0dbd33b7ac077daf567db2efa53fad3caa9f.tar.xz | |
meta-quanta: gsj: remove unneeded binaries
Save room in flash by taking out some binaries that are unused.
This includes defining a new distro based on Phosphor that removes LDAP,
SLP, and Avahi as these are not used.
(From meta-quanta rev: c27ca70b613310ffc4ac41b11b361691e99fc0f3)
Change-Id: Ia22da47136c715734d2df6fb767fee2e53f9bbaf
Signed-off-by: Benjamin Fair <benjaminfair@google.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-quanta')
5 files changed, 9 insertions, 5 deletions
diff --git a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf new file mode 100644 index 000000000..bc3f31bf9 --- /dev/null +++ b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf @@ -0,0 +1,5 @@ +require conf/distro/openbmc-phosphor.conf + +DISTRO_FEATURES_remove = "avahi" +DISTRO_FEATURES_remove = "ldap" +DISTRO_FEATURES_remove = "slp" diff --git a/meta-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/local.conf.sample index 12e42fba6..f4488a4c1 100644 --- a/meta-quanta/meta-gsj/conf/local.conf.sample +++ b/meta-quanta/meta-gsj/conf/local.conf.sample @@ -1,5 +1,5 @@ MACHINE ??= "gsj" -DISTRO ?= "openbmc-phosphor" +DISTRO ?= "openbmc-gsj" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index 328796aa0..8746a2168 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -20,6 +20,8 @@ OBMC_MACHINE_FEATURES += "\ obmc-chassis-state-mgmt \ obmc-bmc-state-mgmt \ " +# Remove unneeded binaries from image +IMAGE_FEATURES_remove = "obmc-debug-collector" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps" diff --git a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb index 69172383d..127bc703b 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb @@ -28,7 +28,5 @@ RDEPENDS_${PN}-fans = "" SUMMARY_${PN}-flash = "GSJ Flash" RDEPENDS_${PN}-flash = " \ - obmc-flash-bmc \ - obmc-mgr-download \ - obmc-control-bmc \ + phosphor-ipmi-flash \ " diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend index 4ceec7d2f..1ad5f9d78 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,4 +1,3 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-ipmi-flash" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-pid-control" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " detect-fan-fail" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys" |