mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

openssh: fix warnings about overwritting keys

Browse Source 
* 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 <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2013-04-12 21:56:16 +02:00
parent 29fa7f9ea7
commit 6ac7306132
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend
+7 -7
View File
@@ -1,13 +1,13 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 2}" PRINC := "${@int(PRINC) + 3}"
SYSTEMD_PACKAGES = "openssh-sshd" SYSTEMD_PACKAGES = "${PN}-sshd"
SYSTEMD_SERVICE_openssh-sshd = "sshd.socket" SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
FILES_openssh-sshd += "${systemd_unitdir}/system/sshd.socket" FILES_${PN}-sshd += "${systemd_unitdir}/system/sshd.socket"
RPROVIDES_openssh-sshd += "openssh-sshd-systemd" RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd"
RREPLACES_openssh-sshd += "openssh-sshd-systemd" RREPLACES_${PN}-sshd += "${PN}-sshd-systemd"
RCONFLICTS_openssh-sshd += "openssh-sshd-systemd" RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd"
inherit systemd inherit systemd