diff options
Diffstat (limited to 'meta-phosphor/conf/distro')
-rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-base.inc | 7 | ||||
-rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-defaults.inc | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 31e669b65..8d53c8dda 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -104,16 +104,17 @@ DISTRO_FEATURES_OBMC = " \ DISTRO_FEATURES_DEFAULT = " \ avahi \ + ipv4 \ + ipv6 \ + ldap \ + libc-inet-anl \ pam \ slp \ systemd \ - ldap \ - libc-inet-anl \ " DISTRO_FEATURES += " \ ${DISTRO_FEATURES_DEFAULT} \ - ${DISTRO_FEATURES_LIBC} \ ${DISTRO_FEATURES_OBMC} \ " diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 58be25a05..b90f28062 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -8,11 +8,6 @@ OBMC_POWER_INSTANCES ?= "0" OBMC_RESET_BUTTON_INSTANCES ?= "0" OBMC_WATCHDOG_INSTANCES ?= "0" -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt ?= "obmc-phosphor-chassisd" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt ?= "obmc-phosphor-fand" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-hw-example" - # obmc-bmc-state-manager # # Provides an implementation of the xyz.openbmc_project.State.BMC |