bbappends: make distro feature safe

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 1 insertions, 13 deletions

diff --git a/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend
index 0a1b160..025ee4e 100644
--- a/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,13 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://nsswitch.conf"
-
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}"
-PACKAGECONFIG[OpenLDAP] = ",,,nss-pam-ldapd"
-
-do_install_append() {
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then
-        install -m 755 -d ${D}/etc/
-        install -m 644 ${WORKDIR}/nsswitch.conf ${D}/etc/
-    fi
-}
+require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)}