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>
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 0000000..bc3f31b
--- /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 12e42fb..f4488a4 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 328796a..8746a21 100644
--- a/meta-quanta/meta-gsj/conf/machine/gsj.conf
+++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf
@@ -20,6 +20,8 @@
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 6917238..127bc70 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 @@
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 4ceec7d..1ad5f9d 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"