summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-yadro/meta-nicole/conf/machine/nicole.conf2
-rw-r--r--meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend1
2 files changed, 1 insertions, 2 deletions
diff --git a/meta-yadro/meta-nicole/conf/machine/nicole.conf b/meta-yadro/meta-nicole/conf/machine/nicole.conf
index 98c17efb2..d815ef330 100644
--- a/meta-yadro/meta-nicole/conf/machine/nicole.conf
+++ b/meta-yadro/meta-nicole/conf/machine/nicole.conf
@@ -14,5 +14,3 @@ PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "nicole-openpower-fru-vpd-
PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "nicole-openpower-fru-inventory-native"
PREFERRED_PROVIDER_virtual/openpower-fru-properties = "nicole-openpower-fru-properties-native"
PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "nicole-led-manager-config-native"
-
-DISTRO_FEATURES_DEFAULT_remove = " ldap"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
index b538c5fb6..75dc1399a 100644
--- a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -5,3 +5,4 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " \
obmc-yadro-cli \
openpower-fru-vpd \
"
+IMAGE_FEATURES_remove_nicole = "obmc-user-mgmt-ldap"