diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-06 11:59:14 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-08 11:58:44 +0100 |
| commit | fc7132ede27ac67669448d3d2845ce7d46c6a1ee (patch) | |
| tree | 1cdb8f9bb5a2e60ff16b6c71709c4eaac55a5de9 /meta-oe/recipes-kernel | |
| parent | 3a4ea266eb056a2800d9d855cddcd326b4622d22 (diff) | |
| download | meta-openembedded-fc7132ede27ac67669448d3d2845ce7d46c6a1ee.tar.gz | |
linux.inc: support building with B != S which is default now
* this .inc file wasn't working since oe-core commit:
commit 106dab2fd0321e6b4e77b40111e59a3a31d329d4
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri Dec 19 17:46:27 2014 +0000
Subject: kernel: Fix non linux-yocto builds
* Fixes following do_configure error
| NOTE: make oldconfig
| make: *** No rule to make target `oldconfig'. Stop.
| ERROR: oe_runmake failed
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-kernel')
| -rw-r--r-- | meta-oe/recipes-kernel/linux/linux.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta-oe/recipes-kernel/linux/linux.inc b/meta-oe/recipes-kernel/linux/linux.inc index 7b301ae211..e200127718 100644 --- a/meta-oe/recipes-kernel/linux/linux.inc +++ b/meta-oe/recipes-kernel/linux/linux.inc @@ -28,14 +28,14 @@ kernel_conf_variable() { CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" if test "$2" = "n" then - echo "# CONFIG_$1 is not set" >> ${S}/.config + echo "# CONFIG_$1 is not set" >> ${B}/.config else - echo "CONFIG_$1=$2" >> ${S}/.config + echo "CONFIG_$1=$2" >> ${B}/.config fi } do_configure_prepend() { - echo "" > ${S}/.config + echo "" > ${B}/.config CONF_SED_SCRIPT="" # @@ -43,8 +43,8 @@ do_configure_prepend() { # if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm - kernel_conf_variable LOGO y - kernel_conf_variable LOGO_LINUX_CLUT224 y + kernel_conf_variable LOGO y + kernel_conf_variable LOGO_LINUX_CLUT224 y fi # @@ -59,7 +59,7 @@ do_configure_prepend() { # When enabling thumb for userspace we also need thumb support in the kernel if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then - kernel_conf_variable ARM_THUMB y + kernel_conf_variable ARM_THUMB y fi kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\"" @@ -112,9 +112,9 @@ do_configure_prepend() { fi sed -e "${CONF_SED_SCRIPT}" \ - < '${WORKDIR}/defconfig' >>'${S}/.config' + < '${WORKDIR}/defconfig' >>'${B}/.config' - yes '' | oe_runmake oldconfig + yes '' | oe_runmake -C ${S} O=${B} oldconfig } do_configure_append() { |