diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-11-18 13:43:23 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-11-18 13:43:35 -0200 |
commit | c8453dc440ff1d355df362e01816bc18f9de3d50 (patch) | |
tree | eecae0e3ade1de1fc568bf458dab89d8f3863513 | |
parent | 742632a83e9da981788111b4e17dcefba5d32a05 (diff) | |
download | meta-fsl-arm-c8453dc440ff1d355df362e01816bc18f9de3d50.tar.gz meta-fsl-arm-c8453dc440ff1d355df362e01816bc18f9de3d50.tar.bz2 meta-fsl-arm-c8453dc440ff1d355df362e01816bc18f9de3d50.zip |
Revert "linux-imx.inc: Remove imx-test specific hack"
This reverts commit a698f335073dc0a68e3f8554aef08165c5dc69bc as it
depends on a change not included in Dora branch of OE-Core/Poky.
Change-Id: I3a2d56e50566dc90472c78f08899856ae19eb19b
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-kernel/linux/linux-fslc.inc | 3 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx.inc | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc index 378c66b..20e1237 100644 --- a/recipes-kernel/linux/linux-fslc.inc +++ b/recipes-kernel/linux/linux-fslc.inc @@ -12,6 +12,9 @@ inherit kernel require recipes-kernel/linux/linux-imx.inc require recipes-kernel/linux/linux-dtb.inc +# Avoid imx-test installation hacks +IMX_TEST_SUPPORT = "n" + SRC_URI = "git://github.com/Freescale/linux-mainline.git \ file://defconfig" LOCALVERSION = "-fslc" diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index 73af4aa..2ac73e7 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -1,4 +1,4 @@ -# Copyright (C) 2012, 2013 O.S. Systems Software LTDA. +# Copyright (C) 2012 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) DESCRIPTION = "Linux kernel for imx platforms" @@ -13,6 +13,9 @@ inherit kernel LOCALVERSION ?= "+yocto" SCMVERSION ?= "y" +# Add imx-test support hacks +IMX_TEST_SUPPORT ?= "y" + SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git \ file://defconfig \ " @@ -48,3 +51,16 @@ do_configure_prepend() { printf "%s%s" +g $head > ${S}/.scmversion fi } + +# install nedded headers for imx-test compilation +do_install_append() { + if [ "${IMX_TEST_SUPPORT}" = "y" ]; then + # bounds.h may be used by a module and is currently missing + if [ -d include/generated ]; then + cp -r include/generated/* $kerneldir/include/generated/ + fi + + # Host architecture object file + rm -f $kerneldir/scripts/kconfig/kxgettext.o + fi +} |