From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 27 Jan 2015 15:24:52 +0000 (+0000)
Subject: image: Add missing depends on virtual/kernel for depmod data
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~31431
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41f0f86ec0a3e0b6f6c9bb4ef71a4215c00bf66c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

image: Add missing depends on virtual/kernel for depmod data

We need the depmod data so that the kernel depmod command works successfully
at rootfs time. The fact this was working inconsistently is now highlighted
after the command was made to error out. A simple test case is:

bitbake virtual/kernel image
bitbake vrituak/kernel -c clean
bitbake image -c rootfs -f

We fix it by adding the missing dependency, the data is in PKGDATA_DIR and
hence we use packagedata.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 22b6970344e..677c81acaf4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -72,8 +72,10 @@ LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot"
 LDCONFIGDEPEND_libc-uclibc = ""
 LDCONFIGDEPEND_libc-musl = ""
 
-do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}"
-do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot"
+do_rootfs[depends] += " \
+    makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \
+    virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot \
+    virtual/kernel:do_packagedata"
 do_rootfs[recrdeptask] += "do_packagedata"
 
 def command_variables(d):