[oe-commits] Tom Rini : openssh: Don't use ${libdir}exec
git version control
git at git.openembedded.org
Tue May 17 17:14:54 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 49e8503acb8424979b12ec6b5ea17421a1edc80c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=49e8503acb8424979b12ec6b5ea17421a1edc80c
Author: Tom Rini <tom_rini at mentor.com>
Date: Mon May 16 13:13:01 2011 -0700
openssh: Don't use ${libdir}exec
This is 1259e0289ce53198cc6c57a9616c8a1623be502a in OE.
[RP: Added PR bump]
Signed-off-by: Tom Rini <tom_rini at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 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"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b"
-PR = "r1"
+PR = "r2"
DEPENDS = "zlib openssl"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -75,8 +75,8 @@ FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config"
FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config"
FILES_${PN}-sftp = "${bindir}/sftp"
-FILES_${PN}-sftp-server = "${libdir}exec/sftp-server"
-FILES_${PN}-misc = "${bindir}/ssh* ${libdir}exec/ssh*"
+FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
+FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
FILES_${PN}-keygen = "${bindir}/ssh-keygen"
RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
More information about the Openembedded-commits
mailing list