summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-05-16 20:13:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 14:14:44 (GMT)
commit9d424738eb92e5d05c6c4f743cb422b94a554d29 (patch)
tree4b822c28729fb4b7ca12b84121d50dda6c12f360 /meta/recipes-connectivity/openssh
parent339d4933a536e1d672f9d6854742e5ebf16f2639 (diff)
downloadpoky-9d424738eb92e5d05c6c4f743cb422b94a554d29.tar.gz
openssh: Don't use ${libdir}exec
This is 1259e0289ce53198cc6c57a9616c8a1623be502a in OE. [RP: Added PR bump] (From OE-Core rev: 49e8503acb8424979b12ec6b5ea17421a1edc80c) Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_5.6p1.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
index d93a773..b112b79 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b"
9 9
10PR = "r1" 10PR = "r2"
11 11
12DEPENDS = "zlib openssl" 12DEPENDS = "zlib openssl"
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -75,8 +75,8 @@ FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config"
75FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd" 75FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
76FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config" 76FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config"
77FILES_${PN}-sftp = "${bindir}/sftp" 77FILES_${PN}-sftp = "${bindir}/sftp"
78FILES_${PN}-sftp-server = "${libdir}exec/sftp-server" 78FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
79FILES_${PN}-misc = "${bindir}/ssh* ${libdir}exec/ssh*" 79FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
80FILES_${PN}-keygen = "${bindir}/ssh-keygen" 80FILES_${PN}-keygen = "${bindir}/ssh-keygen"
81 81
82RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" 82RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"