From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6787310231094296576 X-Received: by 2002:aa7:da18:: with SMTP id r24mr7073376eds.111.1580293809114; Wed, 29 Jan 2020 02:30:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1d30:: with SMTP id dh16ls5612791edb.10.gmail; Wed, 29 Jan 2020 02:30:08 -0800 (PST) X-Google-Smtp-Source: APXvYqxscf/UcDSEB9HAYNtk5g9gyEoXakQtG4uOm5RUGxPlmQJQfkbmkkCt1g+JO827gJ8SvYg2 X-Received: by 2002:a50:f38e:: with SMTP id g14mr7366116edm.168.1580293808278; Wed, 29 Jan 2020 02:30:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580293808; cv=none; d=google.com; s=arc-20160816; b=KS+a4vwxfgaFrTFcL3h5A/01/Q6Y4F9df/4drNqpxIOebIPzaNgLscjcrE9q7RFswg F/lWgIxEuvdjHddJuLg+STICnyLPrFqj14j+zn06ds67vnxPr5yXgr+RE74jLZiQjgO0 SFWK2xJYSKiZjswju9ae/ImRwnaTBOXwSp3+aEbMJ3syd8cs6GDlKrUcNb7YhkvZ6Zj+ 6OGOBrwcc8Tk6oPLKjiwWmJy6MwI1FwMdMh0MK3EXDC1Op6ShAvhe4AhIRJaYcFaeLZG r6C1o69KdLNrebaKJ0J9vhefqy7ESweqiMhfwV2Pk8dBDkf+WABiQsRzdlxevuINLB9P oX/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=evRabbUK96kyRj4dIQ5w73hoaITPzv3wFIp8QxFEigo=; b=u1NlAMIqGy7rqOWY77O+OhfafgejhA98cAthJ8TCW3iZfnQZVSYI4UbcwIwMbXVUTF pOlAjuTX4geM5Lx+ETfr7/k9lAJ9u5R+DDxxQQ2QvYtq6FjDekzvKum0cmuuk+utcnZi ot/X78foJg8uB4quCFaYUsPzOzZgMSaiRSEUCxdHnNGZBue589anTHNzDGA2xOTsWYwg amVV2Y0Y9SI4xb4UIbmnJ1C4Z9kM/kuGI+HyiJx+NIwkMoKeAGbp/qSTAKDqeofN1w2N o5hU6iFnO9HSRVFc7SlQ/NonyMWXUynRpzsS/8jbUufqxBleTxjsa8pEE0yaiLgVwss4 xAvA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id x18si57225eds.2.2020.01.29.02.30.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2020 02:30:08 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 00TAU7ls011580 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 29 Jan 2020 11:30:07 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.47.1]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00TAU6Dp009574; Wed, 29 Jan 2020 11:30:07 +0100 From: Jan Kiszka To: isar-users Cc: Cedric Hombourger Subject: [PATCH v3 02/14] meta: Decouple kernel copy-out from KERNEL_FILE Date: Wed, 29 Jan 2020 11:29:54 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: mwF7udlyv5BF From: Jan Kiszka 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 Signed-off-by: Jan Kiszka --- 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