helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-30 09:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux.inc: support building with B != S which is default now

Browse Source 
* 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>
This commit is contained in:
Martin Jansa 2015-01-06 11:59:14 +01:00
parent 3a4ea266eb
commit fc7132ede2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-oe/recipes-kernel/linux/linux.inc
View File

@ -28,14 +28,14 @@ kernel_conf_variable() {
CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
if test "$2" = "n" if test "$2" = "n"
then then
echo "# CONFIG_$1 is not set" >> ${S}/.config echo "# CONFIG_$1 is not set" >> ${B}/.config
else else
echo "CONFIG_$1=$2" >> ${S}/.config echo "CONFIG_$1=$2" >> ${B}/.config
fi fi
} }
do_configure_prepend() { do_configure_prepend() {
echo "" > ${S}/.config echo "" > ${B}/.config
CONF_SED_SCRIPT="" CONF_SED_SCRIPT=""
# #
@ -43,8 +43,8 @@ do_configure_prepend() {
# #
if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
kernel_conf_variable LOGO y kernel_conf_variable LOGO y
kernel_conf_variable LOGO_LINUX_CLUT224 y kernel_conf_variable LOGO_LINUX_CLUT224 y
fi fi
# #
@ -59,7 +59,7 @@ do_configure_prepend() {
# When enabling thumb for userspace we also need thumb support in the kernel # When enabling thumb for userspace we also need thumb support in the kernel
if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then
kernel_conf_variable ARM_THUMB y kernel_conf_variable ARM_THUMB y
fi fi
kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\"" kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
@ -112,9 +112,9 @@ do_configure_prepend() {
fi fi
sed -e "${CONF_SED_SCRIPT}" \ 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() { do_configure_append() {