commit 8c09b1465bfd0d86468a2ec6beb8d9d0209ba31b
author Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Aug 11 08:20:31 2020 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Aug 13 19:28:47 2020 -0400
tree e90c03251c32b6e90cdfe433a58a36da09b0a66a
parent 0e72d71a67f8d29df926af2a8c249a521ee62680

phosphor-image: Avoid CORE_IMAGE_EXTRA_INSTALL

CORE_IMAGE_EXTRA_INSTALL is a dumping ground.  Move packages to proper
packagroups (console/sol, rng) and create IMAGE_FEATURES for easy
opt-out.

Move the ffdc application to the debugging packagegroup.  Move the
pam-access plugin to the user management packagegroup.

(From meta-phosphor rev: 94bf53d44193b6c5d123c462333fdedf91613370)

Change-Id: If43af92f9bfcb6e0eef08adefbce077defd90b8d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

meta-phosphor/classes/obmc-phosphor-image.bbclass

diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index 6aec40f..d6ece7f 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -5,6 +5,7 @@
 # - obmc-bmc-state-mgmt               - OpenBMC BMC state management
 # - obmc-chassis-mgmt                 - OpenBMC chassis management
 # - obmc-chassis-state-mgmt           - OpenBMC chassis state management
+# - obmc-console                      - OpenBMC serial over LAN
 # - obmc-devtools                     - OpenBMC development and debugging tools
 # - obmc-fan-control                  - OpenBMC fan management
 # - obmc-fan-mgmt                     - Deprecated - use obmc-fan-control instead
@@ -16,6 +17,7 @@
 # - obmc-leds                         - OpenBMC LED support
 # - obmc-logging-mgmt                 - OpenBMC logging management
 # - obmc-remote-logging-mgmt          - OpenBMC remote logging management
+# - obmc-rng                          - OpenBMC random number generator
 # - obmc-sensors                      - OpenBMC sensor support
 # - obmc-settings-mgmt                - OpenBMC settings management
 # - obmc-software                     - OpenBMC software management
@@ -28,6 +30,7 @@
 FEATURE_PACKAGES_obmc-bmc-state-mgmt ?= "packagegroup-obmc-apps-bmc-state-mgmt"
 FEATURE_PACKAGES_obmc-chassis-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-chassis-mgmt', 'virtual-obmc-chassis-mgmt', '', d)}"
 FEATURE_PACKAGES_obmc-chassis-state-mgmt ?= "packagegroup-obmc-apps-chassis-state-mgmt"
+FEATURE_PACKAGES_obmc-console ?= "packagegroup-obmc-apps-console"
 FEATURE_PACKAGES_obmc-devtools ?= "packagegroup-obmc-apps-devtools"
 FEATURE_PACKAGES_obmc-fan-control ?= "packagegroup-obmc-apps-fan-control"
 FEATURE_PACKAGES_obmc-fan-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-fan-mgmt', 'virtual-obmc-fan-mgmt', '', d)}"
@@ -39,6 +42,7 @@
 FEATURE_PACKAGES_obmc-leds ?= "packagegroup-obmc-apps-leds"
 FEATURE_PACKAGES_obmc-logging-mgmt ?= "packagegroup-obmc-apps-logging"
 FEATURE_PACKAGES_obmc-remote-logging-mgmt ?= "packagegroup-obmc-apps-remote-logging"
+FEATURE_PACKAGES_obmc-rng ?= "packagegroup-obmc-apps-rng"
 FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net"
 FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors"
 FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software"
@@ -53,17 +57,17 @@
 # tree under phosphor-ipmi-host
 FEATURE_PACKAGES_obmc-net-ipmi_qemuall = ""
 
-CORE_IMAGE_EXTRA_INSTALL_append = " \
+# Add new packages to be installed to a package group in
+# packagegroup-obmc-apps, not here.
+OBMC_IMAGE_BASE_INSTALL = " \
         packagegroup-obmc-apps-extras \
-        obmc-console \
-        pam-plugin-access \
         ${OBMC_IMAGE_EXTRA_INSTALL} \
-        ffdc \
-        rng-tools \
         "
 
 OBMC_IMAGE_EXTRA_INSTALL ?= ""
 
+CORE_IMAGE_EXTRA_INSTALL += "${OBMC_IMAGE_BASE_INSTALL}"
+
 remove_etc_version() {
         rm ${IMAGE_ROOTFS}${sysconfdir}/version
 }