Alphabetize lists
Change-Id: I068940d3f400cae26d94dff7f5b29bd596c2a6f6
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index c2455b8..d993bb1 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -2,56 +2,57 @@
# Additional IMAGE_FEATURES available with Phosphor OpenBMC:
#
-# - obmc-phosphor-fan-mgmt - Phosphor OpenBMC fan management
-# - obmc-phosphor-chassis-mgmt - Phosphor OpenBMC chassis management
-# - obmc-phosphor-sensor-mgmt - Phosphor OpenBMC sensor management
-# - obmc-phosphor-flash-mgmt - Phosphor OpenBMC flash management
-# - obmc-phosphor-event-mgmt - Phosphor OpenBMC event management
-# - obmc-phosphor-user-mgmt - Phosphor OpenBMC user management
+# - obmc-bmc-state-mgmt - OpenBMC BMC state management
+# - obmc-chassis-mgmt - OpenBMC chassis management
+# - obmc-chassis-state-mgmt - OpenBMC chassis state management
+# - obmc-event-mgmt - OpenBMC event management
+# - obmc-fan-mgmt - OpenBMC fan management
+# - obmc-flash-mgmt - OpenBMC flash management
+# - obmc-host-ctl - OpenBMC host control
+# - obmc-host-ipmi - OpenBMC host IPMI
+# - obmc-host-state-mgmt - OpenBMC host state management
+# - obmc-logging-mgmt - OpenBMC logging management
+# - obmc-sensor-mgmt - OpenBMC sensor management
# - obmc-settings-mgmt - OpenBMC settings management
-# - obmc-phosphor-system-mgmt - Phosphor OpenBMC system management
-# - obmc-host-ipmi - OpenBMC Host IPMI
-# - obmc-logging - OpenBMC logging management
-# - obmc-host-state-mgmt - OpenBMC Host State Management
-# - obmc-chassis-state-mgmt - OpenBMC Chassis State Management
-# - obmc-bmc-state-mgmt - OpenBMC BMC State Management
+# - obmc-system-mgmt - OpenBMC system management
+# - obmc-user-mgmt - OpenBMC user management
inherit core-image
inherit obmc-phosphor-license
inherit obmc-phosphor-utils
-FEATURE_PACKAGES_obmc-fan-mgmt ?= "${@cf_enabled('obmc-phosphor-fan-mgmt', 'virtual-obmc-fan-mgmt', d)}"
+FEATURE_PACKAGES_obmc-bmc-state-mgmt ?= "${@cf_enabled('obmc-bmc-state-mgmt', 'virtual-obmc-bmc-state-mgmt', d)}"
FEATURE_PACKAGES_obmc-chassis-mgmt ?= "${@cf_enabled('obmc-phosphor-chassis-mgmt', 'virtual-obmc-chassis-mgmt', d)}"
-FEATURE_PACKAGES_obmc-sensor-mgmt ?= "${@cf_enabled('obmc-phosphor-sensor-mgmt', 'virtual-obmc-sensor-mgmt', d)}"
-FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled('obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt', d)}"
+FEATURE_PACKAGES_obmc-chassis-state-mgmt ?= "${@cf_enabled('obmc-chassis-state-mgmt', 'virtual-obmc-chassis-state-mgmt', d)}"
FEATURE_PACKAGES_obmc-event-mgmt ?= "${@df_enabled('obmc-phosphor-event-mgmt', 'virtual-obmc-event-mgmt', d)}"
-FEATURE_PACKAGES_obmc-user-mgmt ?= "${@df_enabled('obmc-phosphor-user-mgmt', 'virtual-obmc-user-mgmt', d)}"
+FEATURE_PACKAGES_obmc-fan-mgmt ?= "${@cf_enabled('obmc-phosphor-fan-mgmt', 'virtual-obmc-fan-mgmt', d)}"
+FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled('obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt', d)}"
+FEATURE_PACKAGES_obmc-host-ctl ?= "${@cf_enabled('obmc-host-ctl', 'virtual-obmc-host-ctl', d)}"
+FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled('obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw', d)}"
+FEATURE_PACKAGES_obmc-host-state-mgmt ?= "${@cf_enabled('obmc-host-state-mgmt', 'virtual-obmc-host-state-mgmt', d)}"
+FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled('obmc-logging-mgmt', 'virtual-obmc-logging-mgmt', d)}"
+FEATURE_PACKAGES_obmc-sensor-mgmt ?= "${@cf_enabled('obmc-phosphor-sensor-mgmt', 'virtual-obmc-sensor-mgmt', d)}"
FEATURE_PACKAGES_obmc-settings-mgmt ?= "${@df_enabled('obmc-settings-mgmt', 'virtual-obmc-settings-mgmt', d)}"
FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled('obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', d)}"
-FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled('obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw', d)}"
-FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled('obmc-logging-mgmt', 'virtual-obmc-logging-mgmt', d)}"
-FEATURE_PACKAGES_obmc-host-ctl ?= "${@cf_enabled('obmc-host-ctl', 'virtual-obmc-host-ctl', d)}"
-FEATURE_PACKAGES_obmc-host-state-mgmt ?= "${@cf_enabled('obmc-host-state-mgmt', 'virtual-obmc-host-state-mgmt', d)}"
-FEATURE_PACKAGES_obmc-chassis-state-mgmt ?= "${@cf_enabled('obmc-chassis-state-mgmt', 'virtual-obmc-chassis-state-mgmt', d)}"
-FEATURE_PACKAGES_obmc-bmc-state-mgmt ?= "${@cf_enabled('obmc-bmc-state-mgmt', 'virtual-obmc-bmc-state-mgmt', d)}"
+FEATURE_PACKAGES_obmc-user-mgmt ?= "${@df_enabled('obmc-phosphor-user-mgmt', 'virtual-obmc-user-mgmt', d)}"
# Install entire Phosphor application stack by default
IMAGE_FEATURES += " \
- obmc-fan-mgmt \
+ obmc-bmc-state-mgmt \
obmc-chassis-mgmt \
- obmc-sensor-mgmt \
- obmc-flash-mgmt \
+ obmc-chassis-state-mgmt \
obmc-event-mgmt \
- obmc-user-mgmt \
+ obmc-fan-mgmt \
+ obmc-flash-mgmt \
+ obmc-host-ctl \
+ obmc-host-ipmi \
+ obmc-host-state-mgmt \
+ obmc-logging-mgmt \
+ obmc-sensor-mgmt \
obmc-settings-mgmt \
obmc-system-mgmt \
- obmc-host-ipmi \
- obmc-logging-mgmt \
- obmc-host-ctl \
+ obmc-user-mgmt \
ssh-server-dropbear \
- obmc-host-state-mgmt \
- obmc-chassis-state-mgmt \
- obmc-bmc-state-mgmt \
"
CORE_IMAGE_EXTRA_INSTALL_append = " bash \
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 5bada92..54b98bc 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -1,27 +1,27 @@
-OBMC_CHASSIS_INSTANCES ?= "0"
-OBMC_POWER_INSTANCES ?= "0"
-OBMC_CHECKSTOP_INSTANCES ?= "0"
-OBMC_HOST_INSTANCES ?= "0"
-OBMC_WATCHDOG_INSTANCES ?= "0"
-OBMC_RESET_BUTTON_INSTANCES ?= "0"
-OBMC_POWER_BUTTON_INSTANCES ?= "0"
OBMC_BMC_INSTANCES ?= "0"
+OBMC_CHASSIS_INSTANCES ?= "0"
+OBMC_CHECKSTOP_INSTANCES ?= "0"
OBMC_FAN_INSTANCES ?= ""
+OBMC_HOST_INSTANCES ?= "0"
+OBMC_POWER_BUTTON_INSTANCES ?= "0"
+OBMC_POWER_INSTANCES ?= "0"
+OBMC_RESET_BUTTON_INSTANCES ?= "0"
+OBMC_WATCHDOG_INSTANCES ?= "0"
-PREFERRED_PROVIDER_virtual/obmc-wsgihost ?= "phosphor-gevent"
-PREFERRED_PROVIDER_virtual/obmc-event-mgmt ?= "obmc-phosphor-event"
-PREFERRED_PROVIDER_virtual/obmc-user-mgmt ?= "obmc-phosphor-user"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-hw-example"
+PREFERRED_PROVIDER_virtual/obmc-bmc-state-mgmt ?= "phosphor-state-manager"
PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt ?= "obmc-phosphor-chassisd"
+PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-state-manager"
+PREFERRED_PROVIDER_virtual/obmc-event-mgmt ?= "obmc-phosphor-event"
PREFERRED_PROVIDER_virtual/obmc-fan-mgmt ?= "obmc-phosphor-fand"
PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd"
-PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd"
-PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings"
-PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-hw-example"
PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-state-manager"
-PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-state-manager"
-PREFERRED_PROVIDER_virtual/obmc-bmc-state-mgmt ?= "phosphor-state-manager"
+PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging"
+PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord"
+PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd"
+PREFERRED_PROVIDER_virtual/obmc-user-mgmt ?= "obmc-phosphor-user"
+PREFERRED_PROVIDER_virtual/obmc-wsgihost ?= "phosphor-gevent"
# virtual/phosphor-ipmi-fru-config
#