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-extended | |
| parent | 425a3fb935f40325baeff88d2519b601a87c418d (diff) | |
| download | openembedded-core-f9f193219bd510160b6b09bae652a9dc8ea01e7b.tar.gz openembedded-core-f9f193219bd510160b6b09bae652a9dc8ea01e7b.tar.bz2 openembedded-core-f9f193219bd510160b6b09bae652a9dc8ea01e7b.zip | |
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-extended')
| -rw-r--r-- | meta/recipes-extended/at/at_3.1.14.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/cronie/cronie_1.4.11.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/sysklogd/sysklogd.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 1 |
5 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-extended/at/at_3.1.14.bb b/meta/recipes-extended/at/at_3.1.14.bb index 480e7329a5..5207a0fc34 100644 --- a/meta/recipes-extended/at/at_3.1.14.bb +++ b/meta/recipes-extended/at/at_3.1.14.bb @@ -7,8 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" DEPENDS = "flex flex-native \ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +VIRTUAL-RUNTIME_initscripts ?= "initscripts" RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ - initscripts-functions \ + ${VIRTUAL-RUNTIME_initscripts} \ " PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" diff --git a/meta/recipes-extended/cronie/cronie_1.4.11.bb b/meta/recipes-extended/cronie/cronie_1.4.11.bb index c698181280..d98d0d9167 100644 --- a/meta/recipes-extended/cronie/cronie_1.4.11.bb +++ b/meta/recipes-extended/cronie/cronie_1.4.11.bb @@ -39,8 +39,6 @@ PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." -RDEPENDS_${PN} = "initscripts-functions" - USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system crontab" diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb index d829f74bd9..d9eb1a2527 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb @@ -34,8 +34,6 @@ PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" INITSCRIPT_NAME = "rpcbind" INITSCRIPT_PARAMS = "start 12 2 3 4 5 . stop 60 0 1 6 ." -RDEPENDS_${PN} = "initscripts-functions" - SYSTEMD_SERVICE_${PN} = "rpcbind.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index ef7004429c..3a518103ea 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -24,8 +24,6 @@ SRC_URI_append_e500v2 = " file://no-vectorization.patch" INITSCRIPT_NAME = "syslog" CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}" -RDEPENDS_${PN} = "initscripts-functions" - CFLAGS_append = " -DSYSV" do_install () { diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb index c43892c719..1928949e94 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb @@ -7,7 +7,6 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8" DEPENDS = "" -RDEPENDS_${PN} = "initscripts-functions" PR = "r2" SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ |