From 11ef55a93bd2bbd95e203fab3aa237322923ffd9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Jan 2015 13:01:29 +0000 Subject: kernel/image/depmodwrapper: Fixups for depmod With the rpm package backend enabled, running: bitbake bitbake virtual/kernel -c clean bitbake -c rootfs -f results in an image with incorrect kernel module dependency information. The problem is that the System.map and kernel-abiversion files are needed for depmod and after the recent kernel changes, these are no longer in sstate. Its reasonable to require the kernel to unpack/build if you're about to build a module against it. It is not reasonable to require this just to build a rootfs. Therefore stash the needed files specifically for depmod. Also fix some STAGING_KERNEL_DIR references which were incorrect, found whilst sorting through his change. (From OE-Core rev: b851504dcf5e147c9efb1c7b6a4d22c1a1a87cd7) Signed-off-by: Richard Purdie --- meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb') diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb index 4d2bec4714..758908bff9 100644 --- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb @@ -21,7 +21,7 @@ EXTRA_OEMAKE = "" # support. Note that staprun expects it in the systemtap/runtime directory, # not in /lib/modules. do_compile() { - if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_DIR}/.config + if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_BUILDDIR}/.config then unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ -- cgit v1.2.3-54-g00ecf