From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6701143333816762368 X-Received: by 2002:a5d:494d:: with SMTP id r13mr21989356wrs.152.1560231517869; Mon, 10 Jun 2019 22:38:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fb4f:: with SMTP id c15ls4200121wrs.11.gmail; Mon, 10 Jun 2019 22:38:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqzH7CBZD6nKna+pjxVfxzOU4uQjiVap5TtVj0FyNkLSaRsunQLBqYJU8ZshitrnhIpzFRFV X-Received: by 2002:a5d:5286:: with SMTP id c6mr34840778wrv.118.1560231517502; Mon, 10 Jun 2019 22:38:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560231517; cv=none; d=google.com; s=arc-20160816; b=I+LsUym21iKbWkGVMB35d0D2ijxwW7k1ePfmfNs8zNjszs+0tyPZi8PUdt/yfqHlqw 2JxQHuiV4Lez231KgNmzjhV0nY9iiAiCReyOjaIz18AbzBVpZdROdmD6giX8mn4lwoFX 9Z28EV/O2dXcN8YdfQbeE4qoZQ0D0U4rY+5B7I+TAeS/6Xmik3D77gj9uL7MXDF8YBr0 XYE2qFDxbygBVdjI7zUma2Y0FFHge25N7IOsAvH9GrCsr0bifzFCjhOeuHRYsGBkEFBs 3q87w4hLNAK3zFtpSgcw4Hd8xpVHmOqdlso6IZpxI8RdMWVij9ZNKngPnG99OvLrkTze Onvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=5ruf8wJTFk95TT5L17E7+mQ3Qokj8L+PNPsrr968+BY=; b=pZ0dVMuWOo++dc8/L+0U2p7noPjfJW4NI6YsJ6rivoLKkE5oCfJxseUedaKkAibnoi cTatGzUGA5SdLEAKQQzR5C5X5O8XfjfF3i2n7ZN/++O6u8WRLLamAs7u1+9Mz8S213xE t/oo7UemLsnGfiQoUfgsh9E7TJPMbvexz3D2HHPSD33nkkz/ZUEVbNtpGsq4tpScOu3d UAIzRsLG14uKK5jseJ9Cvo3nY1CNcQCQlgKAqkH8ecwqATYeJlPXHEFOWqnC++DYCcSw RwCCFWyuzul5UKPai36oDB1UOFvnBPDtApuljuOl1rsLA0plDwymly9n6i49tVVUxz0+ 2v9w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com. [192.94.38.131]) by gmr-mx.google.com with ESMTPS id h13si748214wrt.4.2019.06.10.22.38.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 22:38:37 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) client-ip=192.94.38.131; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Received: from nat-ies.mentorg.com ([192.94.31.2] helo=svr-ies-mbx-02.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1haZUS-0004tm-Am from Cedric_Hombourger@mentor.com for isar-users@googlegroups.com; Mon, 10 Jun 2019 22:38:36 -0700 Received: from FRG-W10-HOMBOUR.world.mentorg.com (137.202.0.90) by svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Tue, 11 Jun 2019 06:38:32 +0100 From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH 1/7] image.bbclass: introduce KERNEL_FILE (defaults to vmlinuz) Date: Tue, 11 Jun 2019 07:38:11 +0200 Message-ID: <1560231497-140-2-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560231497-140-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1560231497-140-1-git-send-email-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: H+n3A1JIKIjy Some Debian ports use a non-standard name for the symbolic link to the Linux kernel: e.g. "vmlinux" for the mips port instead of the usual "vmlinuz". The name of the symbolic link is needed for Isar to copy the kernel image to tmp/deploy/images/ (an incorrect name causes the copy_boot_file task to fail). Signed-off-by: Cedric Hombourger --- meta/classes/image.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 1950263..ec6bd39 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -13,7 +13,8 @@ IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getV IMAGE_FULLNAME = "${PF}" # These variables are used by wic and start_vm -KERNEL_IMAGE ?= "${PF}-vmlinuz" +KERNEL_FILE ?= "vmlinuz" +KERNEL_IMAGE ?= "${PF}-${KERNEL_FILE}" INITRD_IMAGE ?= "${PF}-initrd.img" # Useful variables for imager implementations: @@ -123,7 +124,7 @@ EOF do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" do_copy_boot_files() { - kernel="$(realpath -q '${IMAGE_ROOTFS}/vmlinuz')" + kernel="$(realpath -q '${IMAGE_ROOTFS}/${KERNEL_FILE}')" if [ -n "$kernel" ]; then cp -f "$kernel" '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}' fi -- 2.11.0