commit 113fe568c65247e4dc99513b679b74c049178d36
author Brad Bishop <bradleyb@fuzziesquirrel.com> Mon Aug 10 20:20:47 2020 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Aug 13 23:24:28 2020 +0000
tree a3516d769d3b176a804e1e1dbfcb4cfd0c47d472
parent 26921a3944fe1a7d223212c9715e6b50dd53f666

obmc-phosphor-image: devtools refactoring

Move i2c tools to the devtools package, right next to gpio tools.

Rename extrasdevtools to just devtools.  "Extra" doesn't convey any
useful information.  We can get away with this rename since noone is
touching the package.

Add an IMAGE_FEATURE for devtools, for easy opt-out.

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

classes/obmc-phosphor-image.bbclass

diff --git a/classes/obmc-phosphor-image.bbclass b/classes/obmc-phosphor-image.bbclass
index 9d4dbc8..6aec40f 100644
--- a/classes/obmc-phosphor-image.bbclass
+++ b/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-devtools                     - OpenBMC development and debugging tools
 # - obmc-fan-control                  - OpenBMC fan management
 # - obmc-fan-mgmt                     - Deprecated - use obmc-fan-control instead
 # - obmc-flash-mgmt                   - OpenBMC flash management
@@ -27,6 +28,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-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)}"
 FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt', '', d)}"
@@ -51,17 +53,13 @@
 # tree under phosphor-ipmi-host
 FEATURE_PACKAGES_obmc-net-ipmi_qemuall = ""
 
-CORE_IMAGE_EXTRA_INSTALL_append = " bash \
+CORE_IMAGE_EXTRA_INSTALL_append = " \
         packagegroup-obmc-apps-extras \
-        packagegroup-obmc-apps-extrasdevtools \
-        i2c-tools \
         obmc-console \
         pam-plugin-access \
         ${OBMC_IMAGE_EXTRA_INSTALL} \
         ffdc \
-        rsync \
         rng-tools \
-        lrzsz \
         "
 
 OBMC_IMAGE_EXTRA_INSTALL ?= ""