summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/kernel.bbclass13
-rw-r--r--meta/conf/documentation.conf2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc2
3 files changed, 10 insertions, 7 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index e7e2cb3963..dcf8bae042 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -484,15 +484,18 @@ python split_kernel_packages () {
484} 484}
485 485
486# Many scripts want to look in arch/$arch/boot for the bootable 486# Many scripts want to look in arch/$arch/boot for the bootable
487# image. This poses a problem for vmlinux based booting. This 487# image. This poses a problem for vmlinux and vmlinuz based
488# task arranges to have vmlinux appear in the normalized directory 488# booting. This task arranges to have vmlinux and vmlinuz appear
489# location. 489# in the normalized directory location.
490do_kernel_link_vmlinux() { 490do_kernel_link_images() {
491 if [ ! -d "${B}/arch/${ARCH}/boot" ]; then 491 if [ ! -d "${B}/arch/${ARCH}/boot" ]; then
492 mkdir ${B}/arch/${ARCH}/boot 492 mkdir ${B}/arch/${ARCH}/boot
493 fi 493 fi
494 cd ${B}/arch/${ARCH}/boot 494 cd ${B}/arch/${ARCH}/boot
495 ln -sf ../../../vmlinux 495 ln -sf ../../../vmlinux
496 if [ -f ../../../vmlinuz ]; then
497 ln -sf ../../../vmlinuz
498 fi
496} 499}
497 500
498do_strip() { 501do_strip() {
@@ -522,7 +525,7 @@ do_strip() {
522} 525}
523do_strip[dirs] = "${B}" 526do_strip[dirs] = "${B}"
524 527
525addtask do_strip before do_sizecheck after do_kernel_link_vmlinux 528addtask do_strip before do_sizecheck after do_kernel_link_images
526 529
527# Support checking the kernel size since some kernels need to reside in partitions 530# Support checking the kernel size since some kernels need to reside in partitions
528# with a fixed length or there is a limit in transferring the kernel to memory 531# with a fixed length or there is a limit in transferring the kernel to memory
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index dcc324c6cc..c0025f5a76 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -28,7 +28,7 @@ do_install_ptest_base[doc] = "Copies the runtime test suite files from the compi
28do_kernel_checkout[doc] = "Checks out source/meta branches for a linux-yocto style kernel" 28do_kernel_checkout[doc] = "Checks out source/meta branches for a linux-yocto style kernel"
29do_kernel_configcheck[doc] = "Validates the kernel configuration for a linux-yocto style kernel" 29do_kernel_configcheck[doc] = "Validates the kernel configuration for a linux-yocto style kernel"
30do_kernel_configme[doc] = "Assembles the kernel configuration for a linux-yocto style kernel" 30do_kernel_configme[doc] = "Assembles the kernel configuration for a linux-yocto style kernel"
31do_kernel_link_vmlinux[doc] = "Creates a symbolic link in arch/$arch/boot for vmlinux kernel images" 31do_kernel_link_images[doc] = "Creates a symbolic link in arch/$arch/boot for vmlinux and vmlinuz kernel images"
32do_listtasks[doc] = "Lists all defined tasks for a target" 32do_listtasks[doc] = "Lists all defined tasks for a target"
33do_menuconfig[doc] = "Runs 'make menuconfig' for the kernel" 33do_menuconfig[doc] = "Runs 'make menuconfig' for the kernel"
34do_package[doc] = "Analyzes the content of the holding area and splits it into subsets based on available packages and files" 34do_package[doc] = "Analyzes the content of the holding area and splits it into subsets based on available packages and files"
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index bd91570442..0af9f8cb1a 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -53,6 +53,6 @@ do_install_append(){
53} 53}
54 54
55# extra tasks 55# extra tasks
56addtask kernel_link_vmlinux after do_compile before do_install 56addtask kernel_link_images after do_compile before do_install
57addtask validate_branches before do_patch after do_kernel_checkout 57addtask validate_branches before do_patch after do_kernel_checkout
58addtask kernel_configcheck after do_configure before do_compile 58addtask kernel_configcheck after do_configure before do_compile