[oe-commits] org.oe.dev openssh 4.6p1: /var/run is volatile; removed this from the packages to avoid

[mwester commit]

openssh 4.6p1: /var/run is volatile; removed this from the packages to avoid
conflicts with the volatiles mechanism.

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 5ed171e38857a6197e3d81ccd457d5cf7c7aa123
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5ed171e38857a6197e3d81ccd457d5cf7c7aa123
Files:
1
packages/openssh/openssh_4.6p1.bb
Diffs:

#
# mt diff -rad14e2f914335a7ac4fdf18be48e9f7f76f9a5a4 -r5ed171e38857a6197e3d81ccd457d5cf7c7aa123
#
# 
# 
# patch "packages/openssh/openssh_4.6p1.bb"
#  from [59b74e2e06b33ac4b9f999bb6c689c636cdd7849]
#    to [af980ce34132a255f09adfcc9c6dca24ba3fa96a]
# 
============================================================
--- packages/openssh/openssh_4.6p1.bb	59b74e2e06b33ac4b9f999bb6c689c636cdd7849
+++ packages/openssh/openssh_4.6p1.bb	af980ce34132a255f09adfcc9c6dca24ba3fa96a
@@ -16,7 +16,7 @@ LICENSE = "BSD"
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
            file://sshd_config \
@@ -55,6 +55,7 @@ do_install_append() {
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
 	mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh
 	mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh
+	rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
 }
 
 PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc"
@@ -62,7 +63,7 @@ FILES_openssh-sshd = "${sbindir}/sshd /$
 FILES_openssh-scp = "${bindir}/scp.${PN}"
 FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config"
 FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen"
-FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd"
+FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config"
 FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server"
 FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*"