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:22:11 +0000 |
commit | 85b3ba930dccbd6df7cbc9ef6e91ea393b3f89d4 (patch) | |
tree | d33aa04586357b7e8a392be7aa2e84580d89065a /meta/recipes-core | |
parent | c2bb0ce67159ebc2ed9f21df0b09054e1420ec67 (diff) | |
download | poky-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-core')
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_208.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 2 |
3 files changed, 3 insertions, 3 deletions
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+" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ |
7 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" | 7 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" |
8 | DEPENDS = "expat virtual/libintl" | 8 | DEPENDS = "expat virtual/libintl" |
9 | RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)} initscripts-functions" | 9 | RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" |
10 | RDEPENDS_dbus_class-native = "" | 10 | RDEPENDS_dbus_class-native = "" |
11 | RDEPENDS_dbus_class-nativesdk = "" | 11 | RDEPENDS_dbus_class-nativesdk = "" |
12 | 12 | ||
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" | |||
237 | 237 | ||
238 | FILES_udev-dbg += "/lib/udev/.debug" | 238 | FILES_udev-dbg += "/lib/udev/.debug" |
239 | 239 | ||
240 | RDEPENDS_udev += "udev-utils initscripts-functions" | 240 | RDEPENDS_udev += "udev-utils" |
241 | RPROVIDES_udev = "hotplug" | 241 | RPROVIDES_udev = "hotplug" |
242 | RRECOMMENDS_udev += "udev-hwdb" | 242 | RRECOMMENDS_udev += "udev-hwdb" |
243 | 243 | ||
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 \ | |||
7 | file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" | 7 | file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" |
8 | PR = "r11" | 8 | PR = "r11" |
9 | 9 | ||
10 | RDEPENDS_${PN} = "${PN}-inittab initscripts-functions" | 10 | RDEPENDS_${PN} = "${PN}-inittab" |
11 | 11 | ||
12 | SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \ | 12 | SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \ |
13 | file://install.patch \ | 13 | file://install.patch \ |