diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2013-03-28 14:54:09 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-02 18:15:21 +0100 |
| commit | c47b7734614b28c740ad0eecf409f1e4c0288224 (patch) | |
| tree | 2ba20d31451790d26633055aae3f86c2d3aea008 | |
| parent | 2375ff3f0f98667e14351e1d5fefe6a3d76be04b (diff) | |
| download | poky-c47b7734614b28c740ad0eecf409f1e4c0288224.tar.gz | |
openssh: don't add update-rc.d to RDEPENDS
* sysvinit/systemd assumes that update-rc.d can be inhibited
* with systemd enabled, sysvinit scripts are missing in packages
and update-rc.d needs to be put in BAD_RECOMMENDATIONS to prevent
update-rc.d trying to install them in postinst
* update-rd.c shouldn't be in DEPENDS
(From OE-Core rev: e9e4a90c7e66abe2ab2c335d60ef91e869f48693)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_6.1p1.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.1p1.bb b/meta/recipes-connectivity/openssh/openssh_6.1p1.bb index 32c3b2c8a4..0cffd2316d 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.1p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.1p1.bb | |||
| @@ -96,8 +96,7 @@ FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" | |||
| 96 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" | 96 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" |
| 97 | 97 | ||
| 98 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" | 98 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" |
| 99 | DEPENDS_${PN}-sshd += "update-rc.d" | 99 | RDEPENDS_${PN}-sshd += "${PN}-keygen" |
| 100 | RDEPENDS_${PN}-sshd += "update-rc.d ${PN}-keygen" | ||
| 101 | 100 | ||
| 102 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" | 101 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" |
| 103 | CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" | 102 | CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" |