From 9d424738eb92e5d05c6c4f743cb422b94a554d29 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 16 May 2011 13:13:01 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssh/openssh_5.6p1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-connectivity/openssh') 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" 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" -- cgit v1.2.3-54-g00ecf