summaryrefslogtreecommitdiffstats
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:35:58 +0100
commit67ecba4be0bc3237c6ac8b16637b2c5a46b66266 (patch)
tree8bc4bba4111690b657fbdbf7a470787ffa32893a
parentb3d8b37428696d2ac54a7c1a16b8a27cdabef5ec (diff)
downloadpoky-67ecba4be0bc3237c6ac8b16637b2c5a46b66266.tar.gz
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) (From OE-Core rev: 833302761df924bb503cc2ad04ecae1023381f8f) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@
1UPDATERCPN ?= "${PN}" 1UPDATERCPN ?= "${PN}"
2 2
3DEPENDS_append_class-target = " update-rc.d-native update-rc.d" 3DEPENDS_append_class-target = " update-rc.d-native update-rc.d initscripts"
4VIRTUAL-RUNTIME_initscripts ?= "initscripts"
5DEPENDS_append_class-target = " ${VIRTUAL-RUNTIME_initscripts}"
6UPDATERCD = "update-rc.d" 4UPDATERCD = "update-rc.d"
7UPDATERCD_class-cross = "" 5UPDATERCD_class-cross = ""
8UPDATERCD_class-native = "" 6UPDATERCD_class-native = ""