From 6ac730613283cf086ddd37ca5feea4969c130ecc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 12 Apr 2013 21:56:16 +0200 Subject: openssh: fix warnings about overwritting keys * they were causing real issues like openssh-sshd-systemd not really RPROVIDED.. WARNING: Variable key RCONFLICTS_${PN}-sshd (dropbear) replaces original key RCONFLICTS_openssh-sshd ( openssh-sshd-systemd). WARNING: Variable key FILES_${PN}-sshd (${sbindir}/sshd ${sysconfdir}/init.d/sshd ${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config) replaces original key FILES_openssh-sshd ( ${systemd_unitdir}/system/sshd.socket). WARNING: Variable key RPROVIDES_${PN}-sshd (sshd) replaces original key RPROVIDES_openssh-sshd ( openssh-sshd-systemd). Signed-off-by: Martin Jansa --- .../recipes-connectivity/openssh/openssh_6.1p1.bbappend | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-systemd') diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend index fe61a89671..d757c70964 100644 --- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend @@ -1,13 +1,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 2}" +PRINC := "${@int(PRINC) + 3}" -SYSTEMD_PACKAGES = "openssh-sshd" -SYSTEMD_SERVICE_openssh-sshd = "sshd.socket" -FILES_openssh-sshd += "${systemd_unitdir}/system/sshd.socket" -RPROVIDES_openssh-sshd += "openssh-sshd-systemd" -RREPLACES_openssh-sshd += "openssh-sshd-systemd" -RCONFLICTS_openssh-sshd += "openssh-sshd-systemd" +SYSTEMD_PACKAGES = "${PN}-sshd" +SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" +FILES_${PN}-sshd += "${systemd_unitdir}/system/sshd.socket" +RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd" +RREPLACES_${PN}-sshd += "${PN}-sshd-systemd" +RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd" inherit systemd -- cgit v1.2.3-54-g00ecf