From 2c27ef74ddf77bc737c61a566361037d303bb298 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 18 Aug 2020 13:17:26 -0400 Subject: 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 Signed-off-by: Andrew Geissler --- meta-yadro/meta-nicole/conf/machine/nicole.conf | 2 -- .../meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'meta-yadro/meta-nicole') 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" -- cgit v1.2.3