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 | |
| 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>
| -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() { | |||
| 28 | CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" | 28 | CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" |
| 29 | if test "$2" = "n" | 29 | if test "$2" = "n" |
| 30 | then | 30 | then |
| 31 | echo "# CONFIG_$1 is not set" >> ${S}/.config | 31 | echo "# CONFIG_$1 is not set" >> ${B}/.config |
| 32 | else | 32 | else |
| 33 | echo "CONFIG_$1=$2" >> ${S}/.config | 33 | echo "CONFIG_$1=$2" >> ${B}/.config |
| 34 | fi | 34 | fi |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | do_configure_prepend() { | 37 | do_configure_prepend() { |
| 38 | echo "" > ${S}/.config | 38 | echo "" > ${B}/.config |
| 39 | CONF_SED_SCRIPT="" | 39 | CONF_SED_SCRIPT="" |
| 40 | 40 | ||
| 41 | # | 41 | # |
| @@ -43,8 +43,8 @@ do_configure_prepend() { | |||
| 43 | # | 43 | # |
| 44 | if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then | 44 | if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then |
| 45 | install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm | 45 | install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm |
| 46 | kernel_conf_variable LOGO y | 46 | kernel_conf_variable LOGO y |
| 47 | kernel_conf_variable LOGO_LINUX_CLUT224 y | 47 | kernel_conf_variable LOGO_LINUX_CLUT224 y |
| 48 | fi | 48 | fi |
| 49 | 49 | ||
| 50 | # | 50 | # |
| @@ -59,7 +59,7 @@ do_configure_prepend() { | |||
| 59 | 59 | ||
| 60 | # When enabling thumb for userspace we also need thumb support in the kernel | 60 | # When enabling thumb for userspace we also need thumb support in the kernel |
| 61 | if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then | 61 | if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then |
| 62 | kernel_conf_variable ARM_THUMB y | 62 | kernel_conf_variable ARM_THUMB y |
| 63 | fi | 63 | fi |
| 64 | 64 | ||
| 65 | kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\"" | 65 | kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\"" |
| @@ -112,9 +112,9 @@ do_configure_prepend() { | |||
| 112 | fi | 112 | fi |
| 113 | 113 | ||
| 114 | sed -e "${CONF_SED_SCRIPT}" \ | 114 | sed -e "${CONF_SED_SCRIPT}" \ |
| 115 | < '${WORKDIR}/defconfig' >>'${S}/.config' | 115 | < '${WORKDIR}/defconfig' >>'${B}/.config' |
| 116 | 116 | ||
| 117 | yes '' | oe_runmake oldconfig | 117 | yes '' | oe_runmake -C ${S} O=${B} oldconfig |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | do_configure_append() { | 120 | do_configure_append() { |
