diff options
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() { | |||
231 | [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} | 231 | [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} |
232 | install -d ${D}${sysconfdir}/modules-load.d | 232 | install -d ${D}${sysconfdir}/modules-load.d |
233 | install -d ${D}${sysconfdir}/modprobe.d | 233 | install -d ${D}${sysconfdir}/modprobe.d |
234 | |||
235 | # Stash data for depmod | ||
236 | install -d ${D}${datadir}/kernel-depmod/ | ||
237 | echo "${KERNEL_VERSION}" > ${D}${datadir}/kernel-depmod/kernel-abiversion | ||
238 | cp System.map ${D}${datadir}/kernel-depmod/System.map-${KERNEL_VERSION} | ||
234 | } | 239 | } |
235 | do_install[prefuncs] += "package_get_auto_pr" | 240 | do_install[prefuncs] += "package_get_auto_pr" |
236 | 241 | ||
@@ -280,14 +285,21 @@ do_shared_workdir () { | |||
280 | fi | 285 | fi |
281 | } | 286 | } |
282 | 287 | ||
283 | # We have an empty sysroot_stage_all to keep the default routine from | 288 | # Only stage the files we need for depmod, not the modules/firmware |
284 | # package.bbclass from expanding the kernel source into the sysroot and | ||
285 | # colliding with linux-firmware files | ||
286 | sysroot_stage_all () { | 289 | sysroot_stage_all () { |
290 | sysroot_stage_dir ${D}${datadir}/kernel-depmod ${SYSROOT_DESTDIR}${datadir}/kernel-depmod | ||
287 | } | 291 | } |
288 | 292 | ||
289 | KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} oldnoconfig || yes '' | oe_runmake -C ${S} O=${B} oldconfig" | 293 | KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} oldnoconfig || yes '' | oe_runmake -C ${S} O=${B} oldconfig" |
290 | 294 | ||
295 | PACKAGE_PREPROCESS_FUNCS += "kernel_package_preprocess" | ||
296 | |||
297 | kernel_package_preprocess () { | ||
298 | rm -rf ${PKGD}${datadir}/kernel-depmod | ||
299 | rmdir ${PKGD}${datadir} | ||
300 | rmdir ${PKGD}${exec_prefix} | ||
301 | } | ||
302 | |||
291 | kernel_do_configure() { | 303 | kernel_do_configure() { |
292 | # fixes extra + in /lib/modules/2.6.37+ | 304 | # fixes extra + in /lib/modules/2.6.37+ |
293 | # $ scripts/setlocalversion . => + | 305 | # $ scripts/setlocalversion . => + |