diff options
author | Tom Rini <tom_rini@mentor.com> | 2011-05-16 13:13:01 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-17 15:14:44 +0100 |
commit | 9d424738eb92e5d05c6c4f743cb422b94a554d29 (patch) | |
tree | 4b822c28729fb4b7ca12b84121d50dda6c12f360 /meta/recipes-connectivity/openssh | |
parent | 339d4933a536e1d672f9d6854742e5ebf16f2639 (diff) | |
download | poky-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.bb | 6 |
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 d93a773f7f..b112b79181 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" | |||
7 | LICENSE = "BSD" | 7 | LICENSE = "BSD" |
8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b" | 8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b" |
9 | 9 | ||
10 | PR = "r1" | 10 | PR = "r2" |
11 | 11 | ||
12 | DEPENDS = "zlib openssl" | 12 | DEPENDS = "zlib openssl" |
13 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 13 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
@@ -75,8 +75,8 @@ FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config" | |||
75 | FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd" | 75 | FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd" |
76 | FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config" | 76 | FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config" |
77 | FILES_${PN}-sftp = "${bindir}/sftp" | 77 | FILES_${PN}-sftp = "${bindir}/sftp" |
78 | FILES_${PN}-sftp-server = "${libdir}exec/sftp-server" | 78 | FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" |
79 | FILES_${PN}-misc = "${bindir}/ssh* ${libdir}exec/ssh*" | 79 | FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" |
80 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" | 80 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" |
81 | 81 | ||
82 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" | 82 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" |