meta-nicole: opt out of obmc-user-mgmt-ldap
Upstream is in the process of reworking how ldap user management is
included (or not) - moving from a distro feature to an image feature.
Opt out from the new image feature to avoid picking up the ldap user
management packages when upstream makes the switch. There is no longer
any need to remove ldap from DISTRO_FEATURES, so remove that.
(From meta-yadro rev: 8675f543d73843d5d4fe185134d8edc72ef22246)
Change-Id: I5071152dfa9c2d71286d76d72d10a4e4569eea2d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-yadro/meta-nicole/conf/machine/nicole.conf b/meta-yadro/meta-nicole/conf/machine/nicole.conf
index 98c17ef..d815ef3 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-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 b538c5f..75dc139 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-yadro-cli \
openpower-fru-vpd \
"
+IMAGE_FEATURES_remove_nicole = "obmc-user-mgmt-ldap"