From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6701143333816762368 X-Received: by 2002:a19:48c3:: with SMTP id v186mr37538942lfa.42.1560257446761; Tue, 11 Jun 2019 05:50:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:2bd1:: with SMTP id r78ls278946ljr.9.gmail; Tue, 11 Jun 2019 05:50:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqwISipSnzKAFwRmDLgDApSv9ECp4SrNsWlTDU5LCFldT2PG4cYi/8QTcAYzSFSjqHVvS8OX X-Received: by 2002:a2e:658e:: with SMTP id e14mr9705231ljf.147.1560257446312; Tue, 11 Jun 2019 05:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560257446; cv=none; d=google.com; s=arc-20160816; b=XmbLX7dQBXnqTIQBaUcwdFZONgg+gxHwSN2GN1jO1qsrYjMKysbAMY2vXZnXxbr07I rgW0vLeIPkf0nMzhstw7L+Eg1DVqYQd7LM8nD8wETUr6PEenwIembY2OYNBPUvw/8CT2 dEtY2nes++XW25VqxBTH9LevL6ks8QzE1rOvEhfpwRwZUMvBXOelUYiy1HOKgNjq4/DS ssvEBjONnEvUWx/pXJGPS1bGVWL2ibxIg9ZwZNNzczZ4kZOLITJgXFo/nsKomtT8kd8Z tSUHUVs0HeQIj0A4LqTfYcHAPxxi8TctO71g8yamk6NuU0YRKbdaQolKoaMlqvW3KvZi 22Vw== 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=QqbyPsfU0sepWtLRO36k0Slsr94zkXKFx2wW2qALvEq4bvNzgWNOtFgbwPrC6vLa17 fgfnIssTwzpewyhUTNGAM50e42b57+rw45k+OfCkNghWOM9N++A9oaAX64CRK3G+Kqp/ 7lwJcILTFfLHs1pUk4iFmN64L0ZGD3FLydLQRWB6nwY/jr4DICRCTl8GQ4eQb5H9xHCC xvXYuvlB7TP2jU8E2gGcycNH04ipxeBioZ/h5GZxfVJe/+oH/RFlv3b69kuyBXlajB67 nXq3LC32Eg0+gbb1GrVgzCQjQljLxSTxeWQSW7MDTspfak5reBpp/BDDXffwx/wv3xzr NWPQ== 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 z18si284255lfh.1.2019.06.11.05.50.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jun 2019 05:50:45 -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 1hagEd-0003CS-Qn from Cedric_Hombourger@mentor.com for isar-users@googlegroups.com; Tue, 11 Jun 2019 05:50:43 -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 13:50:40 +0100 From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH v2 1/9] image.bbclass: introduce KERNEL_FILE (defaults to vmlinuz) Date: Tue, 11 Jun 2019 14:50:18 +0200 Message-ID: <1560257426-225-2-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560257426-225-1-git-send-email-Cedric_Hombourger@mentor.com> References: <20190611130710.0fddc4d6@md1za8fc.ad001.siemens.net> <1560257426-225-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-04.mgc.mentorg.com (139.181.222.4) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: eYi5ptQQChwF 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