diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2014-01-23 20:12:34 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-02 11:21:55 +0000 |
| commit | f9f193219bd510160b6b09bae652a9dc8ea01e7b (patch) | |
| tree | d0c7e3fb331177209408c231b407d1b13a74e066 /meta/recipes-connectivity | |
| parent | 425a3fb935f40325baeff88d2519b601a87c418d (diff) | |
| download | openembedded-core-f9f193219bd510160b6b09bae652a9dc8ea01e7b.tar.gz | |
Revert "Add missing RDEPENDS of initscripts-functions"
Instead of manually adding initscripts to RDEPENDS of each package,
we should make it automatically handled by the update-rc.d.bbclass.
This solution would have the benefit of backward compatibility. In
other words, users need not modify their recipes.
This reverts commit 16080a3485bd793edd66ed8361f1e8b86a9e19ea.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
4 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb index 59c9b6acce..7f216ac704 100644 --- a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb +++ b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb @@ -24,8 +24,6 @@ inherit autotools update-rc.d INITSCRIPT_NAME = "irattach" INITSCRIPT_PARAMS = "defaults 20" -RDEPENDS_${PN} += "initscripts-functions" - do_compile () { oe_runmake -e -C irattach oe_runmake -e -C irdaping diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb index fd44ea1b20..45eacd970e 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" # util-linux for libblkid DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3" -RDEPENDS_${PN}-client = "rpcbind bash initscripts-functions" -RDEPENDS_${PN} = "${PN}-client bash initscripts-functions" +RDEPENDS_${PN}-client = "rpcbind bash" +RDEPENDS_${PN} = "${PN}-client bash" RRECOMMENDS_${PN} = "kernel-module-nfsd" inherit useradd diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb index 1f78566c6c..5c1d83b3b9 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb @@ -122,7 +122,7 @@ FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" FILES_${PN}-keygen = "${bindir}/ssh-keygen" RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" -RDEPENDS_${PN}-sshd += "${PN}-keygen initscripts-functions" +RDEPENDS_${PN}-sshd += "${PN}-keygen" CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index ed1a3910a6..52bab4fc43 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb @@ -5,7 +5,6 @@ SECTION = "console/network" HOMEPAGE = "http://samba.org/ppp/" BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" DEPENDS = "libpcap" -RDEPENDS_${PN} = "initscripts-functions" LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD" LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ |