diff options
Diffstat (limited to 'meta-openstack/recipes-core')
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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} | |
2 | |||
3 | SRC_URI += "file://nsswitch.conf" | ||
4 | |||
5 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" | ||
6 | PACKAGECONFIG[OpenLDAP] = ",,,nss-pam-ldapd" | ||
7 | |||
8 | do_install_append() { | ||
9 | if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | ||
10 | install -m 755 -d ${D}/etc/ | ||
11 | install -m 644 ${WORKDIR}/nsswitch.conf ${D}/etc/ | ||
12 | fi | ||
13 | } | ||
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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
2 | |||
3 | SRC_URI += "file://nsswitch.conf" | ||
4 | |||
5 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" | ||
6 | PACKAGECONFIG[OpenLDAP] = ",,,nss-pam-ldapd" | ||
7 | |||
8 | do_install_append() { | ||
9 | if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | ||
10 | install -m 755 -d ${D}/etc/ | ||
11 | install -m 644 ${WORKDIR}/nsswitch.conf ${D}/etc/ | ||
12 | fi | ||
13 | } | ||
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 @@ | |||
1 | do_install_append() { | require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} | |
2 | |||
3 | echo >> ${D}${sysconfdir}/init.d/functions | ||
4 | echo init_is_upstart \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
5 | echo \ \ \ \ false >> ${D}${sysconfdir}/init.d/functions | ||
6 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
7 | echo log_daemon_msg \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
8 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
9 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
10 | } | ||
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 @@ | |||
1 | do_install_append() { | ||
2 | |||
3 | echo >> ${D}${sysconfdir}/init.d/functions | ||
4 | echo init_is_upstart \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
5 | echo \ \ \ \ false >> ${D}${sysconfdir}/init.d/functions | ||
6 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
7 | echo log_daemon_msg \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
8 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
9 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
10 | } | ||