From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6954282761614000128 X-Received: by 2002:a17:906:e105:: with SMTP id gj5mr11092414ejb.388.1619516113853; Tue, 27 Apr 2021 02:35:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:4c2:: with SMTP id n2ls7821edw.2.gmail; Tue, 27 Apr 2021 02:35:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwYWdiuE/JGRCKfYS5e0FTA6nkPqrpfwcqS/HX360vgf4shlneko++x35waRmcQH/xHCI4 X-Received: by 2002:a05:6402:199:: with SMTP id r25mr3235914edv.128.1619516113076; Tue, 27 Apr 2021 02:35:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619516113; cv=none; d=google.com; s=arc-20160816; b=Nhen+jxesYLBIWILgvoNkzNHv97TLOboLh4xsFxs3/5YVzKneDTgfmR8T9SJbewDkg jWujboWzhHcHTaOUgNwttkSXZEBwyaL4Oru+2pda92F1HaQf4B22zg/3JMmMi+bV4AyH OBNuiAK+6KSeAOLQ2MRzfXdaZPTK1WQ/B+iRLysjKlXeqZQslO0iSrQPJB3zOKIJ/6Mq dDXtVxjGZnQc67QHOQbtF+3LkUWZKv9qFiRHNXi7bO5e3QmKvscjzKJc5vGX7eI8gYd0 dG/14NwGB+wltUHIWWmyEOqUOAY4NDCtICj02UsnoVVJ0rg2fpbBdtT4YSYDbTLMcZLy 9kaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=8dQ/ccPZoeWI77N/nCgiwIBTmv29aG5AOy3h4hUc7tw=; b=P32RsbDH2aYVvlvvLfAChKhbAfLnEPPp07XqrQ7EGevXIW8R3176KsY7I4bU8mU9Ro qy0cQ6/LVA8VFNG/zpW453LGDb8W1BbKL7eviNEnf0ot7bI1VueYPWEw7bPwt85V19KC JlI1S7xmIN1hkah6Z1Lgwp4pweVkJCVT973xADP3GgYdPKV1w2mIDFRJJnmIjtGl1OGq KtqrH4XPePGsQeIAhYnep//HxSAtG5+LODmM0m+N+0wArtrw+q64DvaibKP3IW5qCdgJ 6ifOSBYDVyO/LaZs+NPWRPo8Xenq31pIr6hpyNPzTO3mt5YQgED4hEttA7FWDsoDxX6h lP8Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id y16si1731406edq.2.2021.04.27.02.35.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Apr 2021 02:35:13 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 13R9ZCRM001300 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 27 Apr 2021 11:35:12 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.26.73]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 13R9RvHO007979; Tue, 27 Apr 2021 11:27:57 +0200 Date: Tue, 27 Apr 2021 11:27:56 +0200 From: Henning Schild To: Florian Bezdeka Cc: , Subject: Re: [PATCH] Enable pcbios wic plugin to work with custom kernels Message-ID: <20210427112756.141aad68@md1za8fc.ad001.siemens.net> In-Reply-To: <20210423092846.274536-1-florian.bezdeka@siemens.com> References: <20210423092846.274536-1-florian.bezdeka@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: xJIZyI58InBW LGTM Am Fri, 23 Apr 2021 11:28:46 +0200 schrieb Florian Bezdeka : > The plugin assumed that custom kernels always have a -${KERNEL_NAME} > suffix, but there is no guarantee for that. The suffix might be > something else or might not exist at all. > > Instead of searching for and replacing KERNEL_NAME the information is > fetched from KERNEL_FILE by splitting at "-". > > Signed-off-by: Florian Bezdeka > --- > meta/classes/wic-img.bbclass | 2 +- > .../wic/plugins/source/bootimg-pcbios-isar.py | 25 > ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) > > diff --git a/meta/classes/wic-img.bbclass > b/meta/classes/wic-img.bbclass index 59dcd2b..5231c48 100644 > --- a/meta/classes/wic-img.bbclass > +++ b/meta/classes/wic-img.bbclass > @@ -96,7 +96,7 @@ WICVARS += "\ > BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD > IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS > INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ > ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS > TRANSLATED_TARGET_ARCH \ > - KERNEL_NAME KERNEL_FILE" > + KERNEL_FILE" > > # Isar specific vars used in our plugins > WICVARS += "KERNEL_IMAGE INITRD_IMAGE DISTRO DISTRO_ARCH" > diff --git > a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py > b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py index > 1ff8df1..2dc90bd 100644 --- > a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++ > b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@ > -132,11 +132,14 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): > syslinux_conf += "LABEL boot\n" kernel_file = > get_bitbake_var("KERNEL_FILE") > - kernel_name = get_bitbake_var("KERNEL_NAME") > rootfs_dir = get_bitbake_var("IMAGE_ROOTFS") > kernel = > os.path.basename(os.path.realpath(os.path.join(rootfs_dir, > kernel_file))) > - kernel_version = > kernel[len(kernel_file)+1:-(len(kernel_name)+1)] > - initrd = "initrd.img-%s-%s" % (kernel_version, > kernel_name) > + kernel_parts = kernel.split("-") > + kernel_suffix = "-".join(kernel_parts[1:]) > + initrd = "initrd.img" > + > + if kernel_suffix: > + initrd += "-%s" % kernel_suffix > > syslinux_conf += "KERNEL " + kernel + "\n" > > @@ -160,15 +163,19 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): > """ > syslinux_dir = cls._get_syslinux_dir(bootimg_dir) > > - staging_kernel_dir = kernel_dir > kernel_file = get_bitbake_var("KERNEL_FILE") > - kernel_name = get_bitbake_var("KERNEL_NAME") > rootfs_dir = rootfs_dir['ROOTFS_DIR'] > kernel = > os.path.basename(os.path.realpath(os.path.join(rootfs_dir, > kernel_file))) > - kernel_version = > kernel[len(kernel_file)+1:-(len(kernel_name)+1)] > - initrd = "initrd.img-%s-%s" % (kernel_version, kernel_name) > - config = "config-%s-%s" % (kernel_version, kernel_name) > - mapfile = "System.map-%s-%s" % (kernel_version, kernel_name) > + kernel_parts = kernel.split("-") > + kernel_suffix = "-".join(kernel_parts[1:]) > + initrd = "initrd.img" > + config = "config" > + mapfile = "System.map" > + > + if kernel_suffix: > + initrd += "-%s" % kernel_suffix > + config += "-%s" % kernel_suffix > + mapfile += "-%s" % kernel_suffix > > hdddir = "%s/hdd/boot" % cr_workdir >