aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYannick Gicquel <yannick.gicquel@iot.bzh>2016-01-08 16:13:31 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-01-13 15:47:36 +0000
commitbb013ecc7450151db021c58614d9fc06b401c3b0 (patch)
treeeca8670f1f5b22ba6688f7f999abd539b461576a
parente416fa6c3cb56a401e59af21db804c7597e5e3c1 (diff)
kernel: fixup build when builddir differ from sourcedir
Since yocto 1.8, kernel build method enhanced to avoid source tree duplication. This patch align paths to handle ${S} and ${B} accordingly. This patch is required to build linux-renesas on yocto > 1.7. Please refer to commit 1dd37a2a in poky for more details. Change-Id: I29de3e72f6e4617e0ef2685b87dd6fbca296328a Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh>
-rw-r--r--meta-rcar-gen2/recipes-kernel/linux/linux.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux.inc b/meta-rcar-gen2/recipes-kernel/linux/linux.inc
index 54e8474..49f182e 100644
--- a/meta-rcar-gen2/recipes-kernel/linux/linux.inc
+++ b/meta-rcar-gen2/recipes-kernel/linux/linux.inc
@@ -31,15 +31,15 @@ kernel_configure_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() {
# Clean .config
- echo "" > ${S}/.config
+ echo "" > ${B}/.config
CONF_SED_SCRIPT=""
# oabi / eabi support
@@ -164,9 +164,9 @@ do_configure_prepend() {
# Keep this the last line
# Remove all modified configs and add the rest to .config
- sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config'
+ sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config'
- yes '' | oe_runmake oldconfig
+ yes '' | oe_runmake -C ${S} O=${B} oldconfig
}
do_configure_bluetooth() {
@@ -187,7 +187,7 @@ do_configure_append_porter() {
kernel_configure_variable CAN_VCAN y
kernel_configure_variable CAN_RCAR y
- yes '' | oe_runmake oldconfig
+ yes '' | oe_runmake -C ${S} O=${B} oldconfig
}
do_configure_append_smack() {
@@ -203,7 +203,7 @@ do_configure_append_smack() {
kernel_configure_variable DEFAULT_SECURITY "smack"
kernel_configure_variable DEFAULT_SECURITY_SMACK y
- yes '' | oe_runmake oldconfig
+ yes '' | oe_runmake -C ${S} O=${B} oldconfig
}
# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled