diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-01-22 18:02:40 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-01-22 18:02:40 +0000 |
commit | 1d174d4e851b1dc74c4c4778cf7d0c52d1f38142 (patch) | |
tree | b02bc6399a9bb5dfabd6dff33da1a1c41a6b3e0a /meta-openstack/recipes-connectivity/openssh | |
parent | a401a1c3d86eb00bab8bfccba83c12cc67ce06a1 (diff) | |
download | meta-cloud-services-1d174d4e851b1dc74c4c4778cf7d0c52d1f38142.tar.gz |
bbappends: make distro feature safe
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'meta-openstack/recipes-connectivity/openssh')
-rw-r--r-- | meta-openstack/recipes-connectivity/openssh/openssh_%.bbappend | 11 | ||||
-rw-r--r-- | meta-openstack/recipes-connectivity/openssh/openssh_openstack.inc | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_%.bbappend b/meta-openstack/recipes-connectivity/openssh/openssh_%.bbappend index 5c0d724..7233019 100644 --- a/meta-openstack/recipes-connectivity/openssh/openssh_%.bbappend +++ b/meta-openstack/recipes-connectivity/openssh/openssh_%.bbappend | |||
@@ -1,11 +1,2 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 1 | require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} |
2 | 2 | ||
3 | SRC_URI += "file://mcs-sshd" | ||
4 | SRC_URI += "file://mcs-sshd_config" | ||
5 | |||
6 | do_install_append() { | ||
7 | if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | ||
8 | install -D -m 644 ${WORKDIR}/mcs-sshd ${D}/etc/pam.d/sshd | ||
9 | install -D -m 644 ${WORKDIR}/mcs-sshd_config ${D}/etc/ssh/sshd_config | ||
10 | fi | ||
11 | } | ||
diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_openstack.inc b/meta-openstack/recipes-connectivity/openssh/openssh_openstack.inc new file mode 100644 index 0000000..5c0d724 --- /dev/null +++ b/meta-openstack/recipes-connectivity/openssh/openssh_openstack.inc | |||
@@ -0,0 +1,11 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
2 | |||
3 | SRC_URI += "file://mcs-sshd" | ||
4 | SRC_URI += "file://mcs-sshd_config" | ||
5 | |||
6 | do_install_append() { | ||
7 | if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then | ||
8 | install -D -m 644 ${WORKDIR}/mcs-sshd ${D}/etc/pam.d/sshd | ||
9 | install -D -m 644 ${WORKDIR}/mcs-sshd_config ${D}/etc/ssh/sshd_config | ||
10 | fi | ||
11 | } | ||