meta-gsj: 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-quanta rev: a6a05a72f7a39af65a5fa28c56650e774fe12e6d)
Change-Id: Ica159c232dad540246166d571e5e3e7bc1824c01
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
index bc3f31b..f643373 100644
--- a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
+++ b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf
@@ -1,5 +1,4 @@
require conf/distro/openbmc-phosphor.conf
DISTRO_FEATURES_remove = "avahi"
-DISTRO_FEATURES_remove = "ldap"
DISTRO_FEATURES_remove = "slp"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 1ad5f9d..d4f5684 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -3,3 +3,4 @@
OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys"
OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " gsj-hotswap-change-setting"
OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " iperf3"
+IMAGE_FEATURES_remove_gsj = "obmc-user-mgmt-ldap"