summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-04 13:09:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-05 14:24:43 +0000
commit6ab56c54f316154d89f03ec0c6c2cb39d1736cff (patch)
tree952d5bde1c81457378d6d995051cd04674dbf489 /meta/recipes-connectivity/openssh
parent82233cd647b1ecc256afb0c3378906cf8af46f8e (diff)
downloadpoky-6ab56c54f316154d89f03ec0c6c2cb39d1736cff.tar.gz
classes/recipes: More optimal DISTRO_FEATURES references
Using the contains function results in more optimal sstate checksums resulting in better cache reuse as we as more consistent code. (From OE-Core rev: 9c93526756e7cbbff027c88eb972f877bcb1f057) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.4p1.bb12
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
index 859fdd615e..b9a7580fdc 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
@@ -80,13 +80,11 @@ do_compile_append () {
80} 80}
81 81
82do_install_append () { 82do_install_append () {
83 for i in ${DISTRO_FEATURES}; 83 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
84 do 84 install -d ${D}${sysconfdir}/pam.d
85 if [ ${i} = "pam" ]; then 85 install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
86 install -d ${D}${sysconfdir}/pam.d 86 fi
87 install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd 87
88 fi
89 done
90 install -d ${D}${sysconfdir}/init.d 88 install -d ${D}${sysconfdir}/init.d
91 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd 89 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
92 rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin 90 rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin