summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-06-05 17:09:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-06 10:25:40 +0100
commitf39d8765b1233219a36331975a248b2cd008abdf (patch)
tree14288537701978e9f391fa4e35aa7b9bc0776387 /meta
parent5f0634a2709bf8c4382c79b190e8b09f91dff8d7 (diff)
downloadast2050-yocto-poky-f39d8765b1233219a36331975a248b2cd008abdf.zip
ast2050-yocto-poky-f39d8765b1233219a36331975a248b2cd008abdf.tar.gz
update-rc.d/useradd: Add additional dependecies
These dependcies are needed to ensure that thier packages are created correctly since these classes have runtime dependiences in their packages but they are not actually created yet at rootfs time. [YOCTO #6072] (From OE-Core rev: bba835fed88c3bd5bb5bd58962034aef57c408d8) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/update-rc.d.bbclass2
-rw-r--r--meta/classes/useradd.bbclass2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 56eef4e..ca9486b 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -1,6 +1,7 @@
UPDATERCPN ?= "${PN}"
DEPENDS_append = " update-rc.d-native"
+DEPENDS_append_class-target = " initscripts"
UPDATERCD = "update-rc.d"
UPDATERCD_class-cross = ""
UPDATERCD_class-native = ""
@@ -67,6 +68,7 @@ python __anonymous() {
}
PACKAGESPLITFUNCS_prepend = "populate_packages_updatercd "
+PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd "
populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_preinst updatercd_postinst"
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 3dd7a61..ea15dab 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -4,7 +4,7 @@ inherit useradd_base
# target sysroot, and shadow -native and -sysroot provide the utilities
# and support files needed to add and modify user and group accounts
DEPENDS_append = "${USERADDDEPENDS}"
-USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow"
+USERADDDEPENDS = " base-files base-passwd shadow-native shadow-sysroot shadow"
USERADDDEPENDS_class-cross = ""
USERADDDEPENDS_class-native = ""
USERADDDEPENDS_class-nativesdk = ""
OpenPOWER on IntegriCloud