meta-fii: mori: clean up package groups
The mori config subtracts 3 and then adds 1 three times. Remove the
redundancy.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I4617ca3701fc58617c78d5e4083d5c802dbc90dd
diff --git a/meta-fii/meta-mori/conf/machine/mori.conf b/meta-fii/meta-mori/conf/machine/mori.conf
index eee3095..b55c9a8 100644
--- a/meta-fii/meta-mori/conf/machine/mori.conf
+++ b/meta-fii/meta-mori/conf/machine/mori.conf
@@ -31,7 +31,6 @@
MACHINE_FEATURES += "dynamic-sensors"
# Remove unneeded binaries from image
-IMAGE_FEATURES:remove = "obmc-bmcweb"
IMAGE_FEATURES:remove = "obmc-console"
IMAGE_FEATURES:remove = "obmc-devtools"
IMAGE_FEATURES:remove = "obmc-fan-control"
@@ -53,6 +52,5 @@
IMAGE_FEATURES:remove = "obmc-system-mgmt"
IMAGE_FEATURES:remove = "obmc-settings-mgmt"
IMAGE_FEATURES:remove = "obmc-network-mgmt"
-IMAGE_FEATURES:remove = "obmc-user-mgmt"
IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap"
OBMC_IMAGE_BASE_INSTALL:remove = "packagegroup-obmc-apps-extras"
diff --git a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
index 84232b1..41cf101 100644
--- a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
@@ -18,11 +18,6 @@
OBMC_IMAGE_EXTRA_INSTALL:append:mori = " i2c-tools"
OBMC_IMAGE_EXTRA_INSTALL:append:mori = " libgpiod-tools"
-# Required for obmc-bmcweb
-OBMC_IMAGE_EXTRA_INSTALL:append:mori = " bmcweb"
-OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-certificate-manager"
-OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-user-manager"
-
# Required for the front port. Part of obmc-console
OBMC_IMAGE_EXTRA_INSTALL:append:mori = " obmc-console"