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/classes/kernel.bbclass | |
| 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/classes/kernel.bbclass')
| -rw-r--r-- | meta/classes/kernel.bbclass | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 183769316b..29498b4faf 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -231,6 +231,11 @@ kernel_do_install() { [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} install -d ${D}${sysconfdir}/modules-load.d install -d ${D}${sysconfdir}/modprobe.d + + # Stash data for depmod + install -d ${D}${datadir}/kernel-depmod/ + echo "${KERNEL_VERSION}" > ${D}${datadir}/kernel-depmod/kernel-abiversion + cp System.map ${D}${datadir}/kernel-depmod/System.map-${KERNEL_VERSION} } do_install[prefuncs] += "package_get_auto_pr" @@ -280,14 +285,21 @@ do_shared_workdir () { fi } -# We have an empty sysroot_stage_all to keep the default routine from -# package.bbclass from expanding the kernel source into the sysroot and -# colliding with linux-firmware files +# Only stage the files we need for depmod, not the modules/firmware sysroot_stage_all () { + sysroot_stage_dir ${D}${datadir}/kernel-depmod ${SYSROOT_DESTDIR}${datadir}/kernel-depmod } KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} oldnoconfig || yes '' | oe_runmake -C ${S} O=${B} oldconfig" +PACKAGE_PREPROCESS_FUNCS += "kernel_package_preprocess" + +kernel_package_preprocess () { + rm -rf ${PKGD}${datadir}/kernel-depmod + rmdir ${PKGD}${datadir} + rmdir ${PKGD}${exec_prefix} +} + kernel_do_configure() { # fixes extra + in /lib/modules/2.6.37+ # $ scripts/setlocalversion . => + |