summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-01-23 20:12:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 11:22:11 +0000
commit85b3ba930dccbd6df7cbc9ef6e91ea393b3f89d4 (patch)
treed33aa04586357b7e8a392be7aa2e84580d89065a /meta/recipes-connectivity
parentc2bb0ce67159ebc2ed9f21df0b09054e1420ec67 (diff)
downloadpoky-85b3ba930dccbd6df7cbc9ef6e91ea393b3f89d4.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. (From OE-Core rev: f9f193219bd510160b6b09bae652a9dc8ea01e7b) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb2
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb4
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.4p1.bb2
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.5.bb1
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
24INITSCRIPT_NAME = "irattach" 24INITSCRIPT_NAME = "irattach"
25INITSCRIPT_PARAMS = "defaults 20" 25INITSCRIPT_PARAMS = "defaults 20"
26 26
27RDEPENDS_${PN} += "initscripts-functions"
28
29do_compile () { 27do_compile () {
30 oe_runmake -e -C irattach 28 oe_runmake -e -C irattach
31 oe_runmake -e -C irdaping 29 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"
9 9
10# util-linux for libblkid 10# util-linux for libblkid
11DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3" 11DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3"
12RDEPENDS_${PN}-client = "rpcbind bash initscripts-functions" 12RDEPENDS_${PN}-client = "rpcbind bash"
13RDEPENDS_${PN} = "${PN}-client bash initscripts-functions" 13RDEPENDS_${PN} = "${PN}-client bash"
14RRECOMMENDS_${PN} = "kernel-module-nfsd" 14RRECOMMENDS_${PN} = "kernel-module-nfsd"
15 15
16inherit useradd 16inherit 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*"
122FILES_${PN}-keygen = "${bindir}/ssh-keygen" 122FILES_${PN}-keygen = "${bindir}/ssh-keygen"
123 123
124RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" 124RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
125RDEPENDS_${PN}-sshd += "${PN}-keygen initscripts-functions" 125RDEPENDS_${PN}-sshd += "${PN}-keygen"
126 126
127CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" 127CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
128CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" 128CONFFILES_${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"
5HOMEPAGE = "http://samba.org/ppp/" 5HOMEPAGE = "http://samba.org/ppp/"
6BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" 6BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs"
7DEPENDS = "libpcap" 7DEPENDS = "libpcap"
8RDEPENDS_${PN} = "initscripts-functions"
9LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD" 8LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD"
10LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ 9LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \
11 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ 10 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \