aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2015-02-17 18:30:41 +0800
committerKoen Kooi <koen.kooi@linaro.org>2015-02-17 19:03:48 +0800
commitf430620598a752a10b3003af6b27f0484e6da288 (patch)
tree044dd72f7c6839dde0fd8134fbf57efe4208465d
parent9ee5bfef065b1b93b5e1a2a222b4340c047f9d47 (diff)
linux-dummy: emit kernel-depmod pkgdata
This fixed do_rootfs failures introduced by the new depmod code. Change-Id: I9e332bb000d75cc7d32426934900f2d211d836fc Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-rw-r--r--meta-linaro-integration/recipes-overlayed/linux/linux-dummy.bb22
1 files changed, 21 insertions, 1 deletions
diff --git a/meta-linaro-integration/recipes-overlayed/linux/linux-dummy.bb b/meta-linaro-integration/recipes-overlayed/linux/linux-dummy.bb
index cc0e4e64..1003299a 100644
--- a/meta-linaro-integration/recipes-overlayed/linux/linux-dummy.bb
+++ b/meta-linaro-integration/recipes-overlayed/linux/linux-dummy.bb
@@ -18,6 +18,9 @@ FILES_kernel-modules = ""
ALLOW_EMPTY_kernel-modules = "1"
DESCRIPTION_kernel-modules = "Kernel modules meta package"
+# Set a fake kernel version to make various checks happy
+KERNEL_VERSION = "3.18"
+
#COMPATIBLE_MACHINE = "your_machine"
PR = "r1"
@@ -38,7 +41,10 @@ do_shared_workdir () {
}
do_install() {
- :
+ # Stash fake data to get around the check in rootfs.py
+ install -d ${D}${datadir}/kernel-depmod/
+ echo "${KERNEL_VERSION}" > ${D}${datadir}/kernel-depmod/kernel-abiversion
+ touch ${D}${datadir}/kernel-depmod/System.map-${KERNEL_VERSION}
}
do_bundle_initramfs() {
@@ -49,6 +55,20 @@ do_deploy() {
:
}
+# 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
+}
+
+emit_depmod_pkgdata() {
+ # Stash data for depmod
+ install -d ${PKGDESTWORK}/kernel-depmod/
+ echo "${KERNEL_VERSION}" > ${PKGDESTWORK}/kernel-depmod/kernel-abiversion
+ touch ${PKGDESTWORK}/kernel-depmod/System.map-${KERNEL_VERSION}
+}
+
+PACKAGEFUNCS += "emit_depmod_pkgdata"
+
addtask bundle_initramfs after do_install before do_deploy
addtask deploy after do_install
addtask shared_workdir after do_compile before do_install