kernel-yocto.bbclass: move do_kernel_link_vmlinux() into kernel.bbclass

Move do_kernel_link_vmlinux() from kernel-yocto.bbclass into
kernel.bbclass so that it's available to any kernel recipe.

Note that the task is not enabled by default in kernel-yocto.bbclass,
so don't enable by default in kernel.bbclass either. To enable, see
the example in linux-yocto.inc, ie:

  addtask kernel_link_vmlinux after do_compile before do_install

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 73ba81039f52b7ed484c43f597648a6d2037561d..6a6a3a31d904bd8d19bf11a8fec4610b1a003fef 100644 (file)
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -355,18 +355,6 @@ do_validate_branches() {
        fi
 }
 
-# Many scripts want to look in arch/$arch/boot for the bootable
-# image. This poses a problem for vmlinux based booting. This 
-# task arranges to have vmlinux appear in the normalized directory
-# location.
-do_kernel_link_vmlinux() {
-       if [ ! -d "${B}/arch/${ARCH}/boot" ]; then
-               mkdir ${B}/arch/${ARCH}/boot
-       fi
-       cd ${B}/arch/${ARCH}/boot
-       ln -sf ../../../vmlinux
-}
-
 OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT"
 KBUILD_OUTPUT = "${B}"
 

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 5c3287bb9882e4ec06e0f256adb547a873375f1d..dee6f7db24333b56db495322169b28f22acce1a5 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -417,6 +417,18 @@ python split_kernel_packages () {
     do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.(bin|fw|cis|dsp)$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
 }
 
+# Many scripts want to look in arch/$arch/boot for the bootable
+# image. This poses a problem for vmlinux based booting. This 
+# task arranges to have vmlinux appear in the normalized directory
+# location.
+do_kernel_link_vmlinux() {
+       if [ ! -d "${B}/arch/${ARCH}/boot" ]; then
+               mkdir ${B}/arch/${ARCH}/boot
+       fi
+       cd ${B}/arch/${ARCH}/boot
+       ln -sf ../../../vmlinux
+}
+
 do_strip() {
        if [ -n "${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}" ]; then
                if [ "${KERNEL_IMAGETYPE}" != "vmlinux" ]; then