From f9f193219bd510160b6b09bae652a9dc8ea01e7b Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 23 Jan 2014 20:12:34 +0800 Subject: 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 Signed-off-by: Saul Wold --- meta/recipes-bsp/alsa-state/alsa-state.bb | 2 +- meta/recipes-bsp/apmd/apmd_3.2.2-14.bb | 1 - meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb | 2 -- meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb | 4 ++-- meta/recipes-connectivity/openssh/openssh_6.4p1.bb | 2 +- meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 1 - meta/recipes-core/dbus/dbus.inc | 2 +- meta/recipes-core/systemd/systemd_208.bb | 2 +- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 2 +- meta/recipes-devtools/distcc/distcc_3.1.bb | 1 - meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +- meta/recipes-extended/at/at_3.1.14.bb | 3 ++- meta/recipes-extended/cronie/cronie_1.4.11.bb | 2 -- meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb | 2 -- meta/recipes-extended/sysklogd/sysklogd.inc | 2 -- meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 1 - meta/recipes-kernel/oprofile/oprofileui-server_git.bb | 2 +- 17 files changed, 11 insertions(+), 22 deletions(-) diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb index 4be74aa036..552fcfc022 100644 --- a/meta/recipes-bsp/alsa-state/alsa-state.bb +++ b/meta/recipes-bsp/alsa-state/alsa-state.bb @@ -37,7 +37,7 @@ PACKAGES += "alsa-states" RRECOMMENDS_alsa-state = "alsa-states" -RDEPENDS_${PN} = "alsa-utils-alsactl initscripts-functions" +RDEPENDS_${PN} = "alsa-utils-alsactl" FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" CONFFILES_${PN} = "${sysconfdir}/asound.conf" diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb index d5ddc174f5..8c4b75eb6d 100644 --- a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb +++ b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb @@ -8,7 +8,6 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://apm.h;beginline=6;endline=18;md5=7d4acc1250910a89f84ce3cc6557c4c2" DEPENDS = "libtool-cross" -RDEPENDS_${PN} = "initscripts-functions" PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \ 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 \ diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 86d6caa46c..cf17b62234 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -6,7 +6,7 @@ LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" DEPENDS = "expat virtual/libintl" -RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)} initscripts-functions" +RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" RDEPENDS_dbus_class-native = "" RDEPENDS_dbus_class-nativesdk = "" diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index 4b0fa2d4b7..41a106a7c2 100644 --- a/meta/recipes-core/systemd/systemd_208.bb +++ b/meta/recipes-core/systemd/systemd_208.bb @@ -237,7 +237,7 @@ PACKAGES =+ "udev-dbg udev udev-utils udev-hwdb" FILES_udev-dbg += "/lib/udev/.debug" -RDEPENDS_udev += "udev-utils initscripts-functions" +RDEPENDS_udev += "udev-utils" RPROVIDES_udev = "hotplug" RRECOMMENDS_udev += "udev-hwdb" diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index a84448aadb..dd25f71530 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" PR = "r11" -RDEPENDS_${PN} = "${PN}-inittab initscripts-functions" +RDEPENDS_${PN} = "${PN}-inittab" SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \ file://install.patch \ diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb index c3cbd05f0e..e3b6cda4b9 100644 --- a/meta/recipes-devtools/distcc/distcc_3.1.bb +++ b/meta/recipes-devtools/distcc/distcc_3.1.bb @@ -6,7 +6,6 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "avahi" -RDEPENDS_${PN} = "initscripts-functions" GTKCONFIG = "gtk" GTKCONFIG_libc-uclibc = "" diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 6d0fbb6c36..1eb0021eec 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -15,7 +15,7 @@ SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git \ " DEPENDS = "util-linux openssl" -RDEPENDS_${PN} = "bash initscripts-functions" +RDEPENDS_${PN} = "bash" S = "${WORKDIR}/git" 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 \ diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb index 63f33e2e60..dbb559965a 100644 --- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb +++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://git.yoctoproject.org/oprofileui \ EXTRA_OECONF += "--disable-client --enable-server" -RDEPENDS_${PN} = "oprofile initscripts-functions" +RDEPENDS_${PN} = "oprofile" do_install_append() { install -d ${D}${sysconfdir}/init.d -- cgit 1.2.3-korg