diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-20 13:01:29 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 14:31:56 +0000 |
| commit | b851504dcf5e147c9efb1c7b6a4d22c1a1a87cd7 (patch) | |
| tree | 0e98dbc147d2f0b56fa1472dbadc565099d157c9 /meta/recipes-kernel | |
| parent | 872342fa3d08edede4a0105ac3ddb0f2ae3224b4 (diff) | |
| download | openembedded-core-contrib-b851504dcf5e147c9efb1c7b6a4d22c1a1a87cd7.tar.gz | |
kernel/image/depmodwrapper: Fixups for depmod
With the rpm package backend enabled, running:
bitbake <image>
bitbake virtual/kernel -c clean
bitbake <image> -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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb | 12 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb index 7533809f27..83a382a2cd 100644 --- a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb +++ b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb @@ -19,21 +19,21 @@ if [ "\$1" != "-a" -o "\$2" != "-b" ]; then echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2 exit 1 fi -if [ ! -r ${STAGING_KERNEL_BUILDDIR}/kernel-abiversion ]; then - echo "Unable to read: ${STAGING_KERNEL_BUILDDIR}/kernel-abiversion" >&2 +if [ ! -r ${STAGING_DIR_TARGET}${datadir}/kernel-depmod/kernel-abiversion ]; then + echo "Unable to read: ${STAGING_DIR_TARGET}${datadir}/kernel-depmod/kernel-abiversion" >&2 else - kernelabi=\$(cat ${STAGING_KERNEL_BUILDDIR}/kernel-abiversion) + kernelabi=\$(cat ${STAGING_DIR_TARGET}${datadir}/kernel-depmod/kernel-abiversion) if [ "\$kernelabi" != "\$4" ]; then echo "Error: Kernel version \$4 does not match kernel-abiversion (\$kernelabi)" >&2 exit 1 fi fi -if [ ! -r ${STAGING_KERNEL_BUILDDIR}/System.map-\$4 ]; then - echo "Unable to read: ${STAGING_KERNEL_BUILDDIR}/System.map-\$4" >&2 +if [ ! -r ${STAGING_DIR_TARHET}${datadir}/kernel-depmod/System.map-\$4 ]; then + echo "Unable to read: ${STAGING_DIR_TARGET}${datadir}/kernel-depmod/System.map-\$4" >&2 exec env depmod "\$1" "\$2" "\$3" "\$4" else - exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_KERNEL_BUILDDIR}/System.map-\$4" "\$4" + exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_DIR_TARGET}${datadir}/kernel-depmod/System.map-\$4" "\$4" fi EOF chmod +x ${D}${bindir_crossscripts}/depmodwrapper 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}" \ |