bbappends: make distro feature safe

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

4 files changed, 25 insertions, 23 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)}
diff --git a/meta-openstack/recipes-core/base-files/base-files_openstack.inc b/meta-openstack/recipes-core/base-files/base-files_openstack.inc
new file mode 100644
index 0000000..0a1b160
--- /dev/null
+++ b/meta-openstack/recipes-core/base-files/base-files_openstack.inc
@@ -0,0 +1,13 @@
+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
+}
diff --git a/meta-openstack/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-openstack/recipes-core/initscripts/initscripts_1.0.bbappend
index 2174997..025ee4e 100644
--- a/meta-openstack/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/meta-openstack/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -1,10 +1 @@
-do_install_append() {
-
-        echo                  >> ${D}${sysconfdir}/init.d/functions
-        echo init_is_upstart \(\) \{  >> ${D}${sysconfdir}/init.d/functions
-        echo \ \ \ \ false >> ${D}${sysconfdir}/init.d/functions
-        echo \}               >> ${D}${sysconfdir}/init.d/functions
-        echo log_daemon_msg \(\) \{  >> ${D}${sysconfdir}/init.d/functions
-        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
-        echo \}               >> ${D}${sysconfdir}/init.d/functions
-}
+require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)}
diff --git a/meta-openstack/recipes-core/initscripts/initscripts_openstack.inc b/meta-openstack/recipes-core/initscripts/initscripts_openstack.inc
new file mode 100644
index 0000000..2174997
--- /dev/null
+++ b/meta-openstack/recipes-core/initscripts/initscripts_openstack.inc
@@ -0,0 +1,10 @@
+do_install_append() {
+
+        echo                  >> ${D}${sysconfdir}/init.d/functions
+        echo init_is_upstart \(\) \{  >> ${D}${sysconfdir}/init.d/functions
+        echo \ \ \ \ false >> ${D}${sysconfdir}/init.d/functions
+        echo \}               >> ${D}${sysconfdir}/init.d/functions
+        echo log_daemon_msg \(\) \{  >> ${D}${sysconfdir}/init.d/functions
+        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
+        echo \}               >> ${D}${sysconfdir}/init.d/functions
+}