summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <peter.x.liu@external.atlascopco.com>2016-05-19 13:05:50 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-19 22:32:08 +0100
commit5444abaaca31c9e4bafd29deb28e97c616526d23 (patch)
tree5aeea04b39a244cff9c290671e13942c5ee1f719
parenta53a9ddbdd4a04dc06de169553fcb82cd871c0cb (diff)
downloadpoky-5444abaaca31c9e4bafd29deb28e97c616526d23.tar.gz
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>
-rw-r--r--meta/classes/kernel.bbclass4
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/recipes-core/images/build-appliance-image_14.0.0.bb2
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb3
4 files changed, 5 insertions, 8 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6e3e81e936..963f327dd6 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -121,10 +121,6 @@ EXTRA_OEMAKE = ""
121 121
122KERNEL_ALT_IMAGETYPE ??= "" 122KERNEL_ALT_IMAGETYPE ??= ""
123 123
124# Define where the kernel headers are installed on the target as well as where
125# they are staged.
126KERNEL_SRC_PATH = "/usr/src/kernel"
127
128copy_initramfs() { 124copy_initramfs() {
129 echo "Copying initramfs into ./usr ..." 125 echo "Copying initramfs into ./usr ..."
130 # In case the directory is not created yet from the first pass compile: 126 # 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 382dadca6d..8a84e53c1b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -407,6 +407,10 @@ OLDEST_KERNEL = "3.2.0"
407OLDEST_KERNEL_aarch64 = "3.14" 407OLDEST_KERNEL_aarch64 = "3.14"
408OLDEST_KERNEL_nios2 = "3.19" 408OLDEST_KERNEL_nios2 = "3.19"
409 409
410# Define where the kernel headers are installed on the target as well as where
411# they are staged.
412KERNEL_SRC_PATH = "/usr/src/kernel"
413
410STAGING_KERNEL_DIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-source" 414STAGING_KERNEL_DIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-source"
411STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifacts" 415STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifacts"
412 416
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 569fb3ae57..2a1a56b617 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 () {
54 cp ${WORKDIR}/README_VirtualBox_Guest_Additions.txt ${IMAGE_ROOTFS}/home/builder/ 54 cp ${WORKDIR}/README_VirtualBox_Guest_Additions.txt ${IMAGE_ROOTFS}/home/builder/
55 55
56 # Create a symlink, needed for out-of-tree kernel modules build 56 # Create a symlink, needed for out-of-tree kernel modules build
57 ln -snr ${IMAGE_ROOTFS}/usr/src/kernel ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build 57 ln -snr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build
58 58
59 echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone 59 echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
60 echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf 60 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 196c8c7a24..0fdd0ad5f6 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"
28do_compile[noexec] = "1" 28do_compile[noexec] = "1"
29do_populate_sysroot[noexec] = "1" 29do_populate_sysroot[noexec] = "1"
30 30
31# Define where the kernel headers are installed on the target as well as where
32# they are staged.
33KERNEL_SRC_PATH = "/usr/src/kernel"
34S = "${STAGING_KERNEL_DIR}" 31S = "${STAGING_KERNEL_DIR}"
35B = "${STAGING_KERNEL_BUILDDIR}" 32B = "${STAGING_KERNEL_BUILDDIR}"
36 33