Merge pull request #72 from Intel-BMC/update2021-0.751-0.75

Update

4 files changed, 39 insertions, 9 deletions

diff --git a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
index f6433733b..34b1dacea 100644
--- a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
+++ b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
@@ -1,4 +1,4 @@
 require conf/distro/openbmc-phosphor.conf
 
-DISTRO_FEATURES_remove = "avahi"
-DISTRO_FEATURES_remove = "slp"
+DISTRO_FEATURES:remove = "avahi"
+DISTRO_FEATURES:remove = "slp"
diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf
index 9bb671876..7591e0953 100644
--- a/meta-quanta/meta-gsj/conf/layer.conf
+++ b/meta-quanta/meta-gsj/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "gsj-layer"
 BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_gsj-layer = "hardknott honister"
diff --git a/meta-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/local.conf.sample
index eacba35bc..feaa9cd06 100644
--- a/meta-quanta/meta-gsj/conf/local.conf.sample
+++ b/meta-quanta/meta-gsj/conf/local.conf.sample
@@ -1,11 +1,11 @@
 MACHINE ??= "gsj"
 DISTRO ?= "openbmc-gsj"
 PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+SANITY_TESTED_DISTROS:append ?= " *"
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+USER_CLASSES ?= "buildstats"
 PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
@@ -14,5 +14,5 @@ BB_DISKMON_DIRS = "\
     ABORT,${DL_DIR},100M,1K \
     ABORT,${SSTATE_DIR},100M,1K \
     ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 
diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf
index b0d508e44..c5089e804 100644
--- a/meta-quanta/meta-gsj/conf/machine/gsj.conf
+++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf
@@ -20,7 +20,37 @@ OBMC_MACHINE_FEATURES += "\
         obmc-bmc-state-mgmt \
         "
 # Remove unneeded binaries from image
-IMAGE_FEATURES_remove = "obmc-debug-collector"
+IMAGE_FEATURES:remove = "obmc-bmc-state-mgmt"
+IMAGE_FEATURES:remove = "obmc-bmcweb"
+IMAGE_FEATURES:remove = "obmc-chassis-state-mgmt"
+IMAGE_FEATURES:remove = "obmc-chassis-mgmt"
+IMAGE_FEATURES:remove = "obmc-console"
+IMAGE_FEATURES:remove = "obmc-dbus-monitor"
+IMAGE_FEATURES:remove = "obmc-devtools"
+IMAGE_FEATURES:remove = "obmc-fan-control"
+IMAGE_FEATURES:remove = "obmc-fan-mgmt"
+IMAGE_FEATURES:remove = "obmc-flash-mgmt"
+IMAGE_FEATURES:remove = "obmc-fru-ipmi"
+IMAGE_FEATURES:remove = "obmc-health-monitor"
+IMAGE_FEATURES:remove = "obmc-host-ctl"
+IMAGE_FEATURES:remove = "obmc-host-ipmi"
+IMAGE_FEATURES:remove = "obmc-host-state-mgmt"
+IMAGE_FEATURES:remove = "obmc-ikvm"
+IMAGE_FEATURES:remove = "obmc-inventory"
+IMAGE_FEATURES:remove = "obmc-leds"
+IMAGE_FEATURES:remove = "obmc-logging-mgmt"
+IMAGE_FEATURES:remove = "obmc-remote-logging-mgmt"
+IMAGE_FEATURES:remove = "obmc-rng"
+IMAGE_FEATURES:remove = "obmc-sensors"
+IMAGE_FEATURES:remove = "obmc-settings-mgmt"
+IMAGE_FEATURES:remove = "obmc-software"
+IMAGE_FEATURES:remove = "obmc-system-mgmt"
+IMAGE_FEATURES:remove = "obmc-user-mgmt"
+IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap"
+IMAGE_FEATURES:remove = "obmc-debug-collector"
+IMAGE_FEATURES:remove = "obmc-network-mgmt"
+IMAGE_FEATURES:remove = "obmc-telemetry"
+OBMC_IMAGE_BASE_INSTALL:remove = "packagegroup-obmc-apps-extras"
 
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps"