From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Cedric Hombourger <Cedric_Hombourger@mentor.com>
Subject: [PATCH v3 02/14] meta: Decouple kernel copy-out from KERNEL_FILE
Date: Wed, 29 Jan 2020 11:29:54 +0100 [thread overview]
Message-ID: <da2afebe2d443799656502dd060cd78d01a87052.1580293806.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1580293806.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1580293806.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
Apparently, there is no consistent correlation between the kernel image
link in the root directory an the image naming pattern in /boot for the
kernel packages. The RISC-V port uses vmlinuz link names, mips uses
vmlinux. So we can't use KERNEL_FILE as abstraction and should rather
probe for the two possible options.
CC: Cedric Hombourger <Cedric_Hombourger@mentor.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/classes/image.bbclass | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 725bc04f..6bcc6cd2 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -127,7 +127,10 @@ EOF
do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}"
do_copy_boot_files() {
- kernel="$(realpath -q '${IMAGE_ROOTFS}/${KERNEL_FILE}')"
+ kernel="$(realpath -q '${IMAGE_ROOTFS}/vmlinuz')"
+ if [ ! -f "$kernel" ]; then
+ kernel="$(realpath -q '${IMAGE_ROOTFS}/vmlinux')"
+ fi
if [ -f "$kernel" ]; then
cp -f "$kernel" '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}'
fi
--
2.16.4
next prev parent reply other threads:[~2020-01-29 10:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 10:29 [PATCH v3 00/14] RISC-V support Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 01/14] meta-isar: Clean up qemu multiconfigs Jan Kiszka
2020-01-29 10:29 ` Jan Kiszka [this message]
2020-01-29 10:29 ` [PATCH v3 03/14] meta: Add debian-sid-ports distro config Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 04/14] meta: Add RISC-V architecture Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 05/14] meta: Allow cross-compilation for RISC-V Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 06/14] start_vm: Add RISC-V 64-bit support Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 07/14] meta-isar: Add qemuriscv64 virtual target Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 08/14] u-boot-script: Account for variations of kernel files and boot commands Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 09/14] linux-custom: Tune strip rule to cover vmlinux images as well Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 10/14] linux-custom: Add support for RISC-V Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 11/14] linux-modules: " Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 12/14] linux-mainline: Avoid failing UBIFS test when defconfig does not support it Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 13/14] linux-mainline: Update to 5.4.10 Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 14/14] meta-isar: Add HiFive Unleashed board as physical RISC-V target Jan Kiszka
2020-02-12 20:19 ` [PATCH v3 00/14] RISC-V support Baurzhan Ismagulov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=da2afebe2d443799656502dd060cd78d01a87052.1580293806.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=Cedric_Hombourger@mentor.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox