diff options
author | Alessio Igor Bogani <alessio.bogani@elettra.eu> | 2022-04-01 13:26:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-03 10:40:31 +0100 |
commit | fb1291ea5f6f0edaf6612ba7bac52136e16af462 (patch) | |
tree | 3773655b757bdbb229c541c7470b689f7bd6340c | |
parent | ffbf7d2b97ff1dc9e847a67f3990c9c2074883f0 (diff) | |
download | poky-fb1291ea5f6f0edaf6612ba7bac52136e16af462.tar.gz |
kernel.bbclass: Use KERNEL_IMAGEDEST instead of hardcoded boot path
The behaviour doesn't change because KERNEL_IMAGEDEST is defined as
'boot' in the same file (line 215).
(From OE-Core rev: b9c3db4953e4e7b423ba9ec5b618fd990c378bc1)
Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/kernel.bbclass | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index b3bbd3b276..7ca847f0a3 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -447,7 +447,6 @@ kernel_do_install() { | |||
447 | # Install various kernel output (zImage, map file, config, module support files) | 447 | # Install various kernel output (zImage, map file, config, module support files) |
448 | # | 448 | # |
449 | install -d ${D}/${KERNEL_IMAGEDEST} | 449 | install -d ${D}/${KERNEL_IMAGEDEST} |
450 | install -d ${D}/boot | ||
451 | 450 | ||
452 | # | 451 | # |
453 | # When including an initramfs bundle inside a FIT image, the fitImage is created after the install task | 452 | # When including an initramfs bundle inside a FIT image, the fitImage is created after the install task |
@@ -465,10 +464,10 @@ kernel_do_install() { | |||
465 | fi | 464 | fi |
466 | done | 465 | done |
467 | 466 | ||
468 | install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} | 467 | install -m 0644 System.map ${D}/${KERNEL_IMAGEDEST}/System.map-${KERNEL_VERSION} |
469 | install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} | 468 | install -m 0644 .config ${D}/${KERNEL_IMAGEDEST}/config-${KERNEL_VERSION} |
470 | install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} | 469 | install -m 0644 vmlinux ${D}/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION} |
471 | [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} | 470 | [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/${KERNEL_IMAGEDEST}/Module.symvers-${KERNEL_VERSION} |
472 | install -d ${D}${sysconfdir}/modules-load.d | 471 | install -d ${D}${sysconfdir}/modules-load.d |
473 | install -d ${D}${sysconfdir}/modprobe.d | 472 | install -d ${D}${sysconfdir}/modprobe.d |
474 | } | 473 | } |
@@ -649,8 +648,8 @@ PACKAGES = "${KERNEL_PACKAGE_NAME} ${KERNEL_PACKAGE_NAME}-base ${KERNEL_PACKAGE_ | |||
649 | FILES:${PN} = "" | 648 | FILES:${PN} = "" |
650 | FILES:${KERNEL_PACKAGE_NAME}-base = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo" | 649 | FILES:${KERNEL_PACKAGE_NAME}-base = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo" |
651 | FILES:${KERNEL_PACKAGE_NAME}-image = "" | 650 | FILES:${KERNEL_PACKAGE_NAME}-image = "" |
652 | FILES:${KERNEL_PACKAGE_NAME}-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" | 651 | FILES:${KERNEL_PACKAGE_NAME}-dev = "/${KERNEL_IMAGEDEST}/System.map* /${KERNEL_IMAGEDEST}/Module.symvers* /${KERNEL_IMAGEDEST}/config* ${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" |
653 | FILES:${KERNEL_PACKAGE_NAME}-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}" | 652 | FILES:${KERNEL_PACKAGE_NAME}-vmlinux = "/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION_NAME}" |
654 | FILES:${KERNEL_PACKAGE_NAME}-modules = "" | 653 | FILES:${KERNEL_PACKAGE_NAME}-modules = "" |
655 | RDEPENDS:${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base (= ${EXTENDPKGV})" | 654 | RDEPENDS:${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base (= ${EXTENDPKGV})" |
656 | # Allow machines to override this dependency if kernel image files are | 655 | # Allow machines to override this dependency if kernel image files are |
@@ -712,7 +711,7 @@ python do_strip() { | |||
712 | extra_sections = d.getVar('KERNEL_IMAGE_STRIP_EXTRA_SECTIONS') | 711 | extra_sections = d.getVar('KERNEL_IMAGE_STRIP_EXTRA_SECTIONS') |
713 | kernel_image = d.getVar('B') + "/" + d.getVar('KERNEL_OUTPUT_DIR') + "/vmlinux" | 712 | kernel_image = d.getVar('B') + "/" + d.getVar('KERNEL_OUTPUT_DIR') + "/vmlinux" |
714 | 713 | ||
715 | if (extra_sections and kernel_image.find('boot/vmlinux') != -1): | 714 | if (extra_sections and kernel_image.find('${KERNEL_IMAGEDEST}/vmlinux') != -1): |
716 | kernel_image_stripped = kernel_image + ".stripped" | 715 | kernel_image_stripped = kernel_image + ".stripped" |
717 | shutil.copy2(kernel_image, kernel_image_stripped) | 716 | shutil.copy2(kernel_image, kernel_image_stripped) |
718 | oe.package.runstrip((kernel_image_stripped, 8, strip, extra_sections)) | 717 | oe.package.runstrip((kernel_image_stripped, 8, strip, extra_sections)) |