[gnome-continuous-yocto/gnomeostree-3.28-rocko: 415/8267] kernel: moves KERNEL_SRC_PATH to bitbake.conf

[Emmanuele Bassi <ebassi src gnome org>]

commit 5444abaaca31c9e4bafd29deb28e97c616526d23
Author: Ming Liu <peter x liu external atlascopco com>
Date:   Thu May 19 13:05:50 2016 +0200

    kernel: moves KERNEL_SRC_PATH to bitbake.conf
    
    "/usr/src/kernel" is being hard-coded in multiple recipes so far, move its
    definition to bitbake.conf.
    
    (From OE-Core rev: eb9f900527e02ca08a1de14b4ac773f513bb1ee4)
    
    Signed-off-by: Ming Liu <peter x liu external atlascopco com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel.bbclass                        |    4 ----
 meta/conf/bitbake.conf                             |    4 ++++
 .../images/build-appliance-image_14.0.0.bb         |    2 +-
 meta/recipes-kernel/linux/kernel-devsrc.bb         |    3 ---
 4 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6e3e81e..963f327 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -121,10 +121,6 @@ EXTRA_OEMAKE = ""
 
 KERNEL_ALT_IMAGETYPE ??= ""
 
-# Define where the kernel headers are installed on the target as well as where
-# they are staged.
-KERNEL_SRC_PATH = "/usr/src/kernel"
-
 copy_initramfs() {
        echo "Copying initramfs into ./usr ..."
        # In case the directory is not created yet from the first pass compile:
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 382dadc..8a84e53 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -407,6 +407,10 @@ OLDEST_KERNEL = "3.2.0"
 OLDEST_KERNEL_aarch64 = "3.14"
 OLDEST_KERNEL_nios2 = "3.19"
 
+# Define where the kernel headers are installed on the target as well as where
+# they are staged.
+KERNEL_SRC_PATH = "/usr/src/kernel"
+
 STAGING_KERNEL_DIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-source"
 STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifacts"
 
diff --git a/meta/recipes-core/images/build-appliance-image_14.0.0.bb 
b/meta/recipes-core/images/build-appliance-image_14.0.0.bb
index 569fb3a..2a1a56b 100644
--- a/meta/recipes-core/images/build-appliance-image_14.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_14.0.0.bb
@@ -54,7 +54,7 @@ fakeroot do_populate_poky_src () {
        cp ${WORKDIR}/README_VirtualBox_Guest_Additions.txt ${IMAGE_ROOTFS}/home/builder/
 
        # Create a symlink, needed for out-of-tree kernel modules build
-       ln -snr ${IMAGE_ROOTFS}/usr/src/kernel ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build
+       ln -snr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build
 
        echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
        echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 196c8c7..0fdd0ad 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -28,9 +28,6 @@ do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 do_populate_sysroot[noexec] = "1"
 
-# Define where the kernel headers are installed on the target as well as where
-# they are staged.
-KERNEL_SRC_PATH = "/usr/src/kernel"
 S = "${STAGING_KERNEL_DIR}"
 B = "${STAGING_KERNEL_BUILDDIR}"