summaryrefslogtreecommitdiff
path: root/meta/classes/update-rc.d.bbclass
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2015-08-24 15:18:34 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:34:18 +0100
commit833302761df924bb503cc2ad04ecae1023381f8f (patch)
tree072807064eff61e92165697b9a9e833ea39fb6b8 /meta/classes/update-rc.d.bbclass
parent9697d13e48633515b80b2ab9bab84ca54ce3ed48 (diff)
downloadopenembedded-core-833302761df924bb503cc2ad04ecae1023381f8f.tar.gz
openembedded-core-833302761df924bb503cc2ad04ecae1023381f8f.tar.bz2
openembedded-core-833302761df924bb503cc2ad04ecae1023381f8f.zip
update-rc.d.bbclass: explicitly dep on initscripts
update-rc.d doesn't just want an initscripts package, it wants initscripts-functions. In the case where VIRTUAL-RUNTIME_initscripts is set to nothing, update-rc.d still needs initscripts-functions to satisfy its runtime dependencies. Further, we shouldn't be using a *runtime* virtual in a *build time* variable. This should resolve image creation failures with configurations without sysv initscripts when a recipe inherits update-rc.d and doesn't inherit systemd. (From OE-Core rev: e6642ae0849e5ac3174c643a7693af25d829d6d1) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/update-rc.d.bbclass')
-rw-r--r--meta/classes/update-rc.d.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 6a08315d99..2a0a74a5f5 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -1,8 +1,6 @@
UPDATERCPN ?= "${PN}"
-DEPENDS_append_class-target = " update-rc.d-native update-rc.d"
-VIRTUAL-RUNTIME_initscripts ?= "initscripts"
-DEPENDS_append_class-target = " ${VIRTUAL-RUNTIME_initscripts}"
+DEPENDS_append_class-target = " update-rc.d-native update-rc.d initscripts"
UPDATERCD = "update-rc.d"
UPDATERCD_class-cross = ""
UPDATERCD_class-native = ""