From 6a6735cb98d529c8c5376aedb5c951339f54fe96 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 8 Oct 2013 17:12:54 -0400 Subject: [PATCH] kernel: restore scripts in the sysroot When building against the sysroot, out of tree modules can require modpost and other utilities normally found in the kernel's scripts directory. For the kernel source in the staging dir, these scripts have been removed to avoid mixing archiectures when packaging kernel-dev (among other things). Rather than further complicate the kernel's install rule, or its packaging, we can restore the scripts by building them in the kernel staging directory after the sstate is installed, making them available to packages that need them. (From OE-Core rev: 5bcd65807aa634060f98928db6011856934dabe4) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index f40ea8985d..dedfab7d54 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -297,6 +297,17 @@ kernel_do_install() { } do_install[prefuncs] += "package_get_auto_pr" + +SSTATEPOSTINSTFUNCS += "kernelscripts_sstate_postinst" +kernelscripts_sstate_postinst () { + if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then + ( + cd ${STAGING_KERNEL_DIR} + oe_runmake scripts + ) + fi +} + sysroot_stage_all_append() { sysroot_stage_dir ${D}${KERNEL_SRC_PATH} ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH} }