From d2ebacb41b100c224f189e693076c130b7f360e8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 25 Mar 2015 09:41:17 -0300 Subject: linux-mfgtool.inc: Adapt to work-shared kernel source The kernel source code is (since OE-Core:6a1ff0e7) used from work-shared. As consequence, the MfgTool kernel needed changes to use a completely separated source code and avoid messing with original Linux kernel ABI identificationfile. Change-Id: Idd43dd5d0d8d9e1ff7cc6e8ce15c8cd60107259d Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-mfgtool.inc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-mfgtool.inc b/recipes-kernel/linux/linux-mfgtool.inc index 5d7219e..948d698 100644 --- a/recipes-kernel/linux/linux-mfgtool.inc +++ b/recipes-kernel/linux/linux-mfgtool.inc @@ -6,7 +6,7 @@ # This file must be included after the original linux-imx.inc file # as it overrides the needed values. # -# Copyright (C) 2014 O.S. Systems Software LTDA. +# Copyright (C) 2014, 2015 O.S. Systems Software LTDA. # Adjust provides PROVIDES = "linux-mfgtool" @@ -18,6 +18,8 @@ KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-mfgtool-${PKGE}-${PKGV}-${PKGR}-${ KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-mfgtool-${MACHINE}" MODULE_IMAGE_BASE_NAME = "modules-mfgtool-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" MODULE_TARBALL_SYMLINK_NAME = "modules-mfgtool-${MACHINE}.tgz" +STAGING_KERNEL_DIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-mfgtool-source" +STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-mfgtool-build-artifacts" # Ensures we prefer our mfgtool specific files FILESEXTRAPATHS_prepend := "${THISDIR}/${ORIG_PN}-${PV}:${THISDIR}/${ORIG_PN}:" @@ -65,17 +67,16 @@ python () { addhandler mfgtool_recipe_handler mfgtool_recipe_handler[eventmask] = "bb.event.RecipePreFinalise" -# FIXME: We need to remove the KERNEL_SRC_PATH contents as +# FIXME: Avoid depmod data emiting as kernel-abiversion path is +# hardcoded. +emit_depmod_pkgdata() { + : +} + +# FIXME: We need to remove the STAGING_KERNEL_BUILDDIR contents as # kernel.bbclass has no way to skip its installation. # FIXME: It is not possible to have external modules against # this kernel variant. do_install_append() { - rm -r ${D}${KERNEL_SRC_PATH} - rmdir ${D}/usr/src ${D}/usr -} - -# FIXME: We must to avoid the staging of KERNEL_SRC_PATH as -# it is being removed (see above FIXME items). -sysroot_stage_all() { - : + rm -r ${STAGING_KERNEL_BUILDDIR} } -- cgit v1.2.3-54-g00ecf