From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6906006289225089024 X-Received: by 2002:a1c:770d:: with SMTP id t13mr28563226wmi.153.1607949888010; Mon, 14 Dec 2020 04:44:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:b688:: with SMTP id g130ls8737563wmf.3.canary-gmail; Mon, 14 Dec 2020 04:44:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyj6ZsYaOBmpQqesxqjAgO5w15W9BAizU3kMC0pq55Db78DC0PFUs53PSsFPRFZh3GHYGUO X-Received: by 2002:a1c:c308:: with SMTP id t8mr27680186wmf.22.1607948881776; Mon, 14 Dec 2020 04:28:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607948881; cv=none; d=google.com; s=arc-20160816; b=fWpnqSr7WmlUpoXNksOQ3DsaR7d9TswEVdaKJMEBep2xI4EXWoeMP3XEYzg2g8EYDl gaSvAdCQojZa9fGxHAJ32b0wG1SYdlMd+MTS07V4TcLpF7NQZzMBLOJISjc21G2jM6ay 5q4B5waYAU0ko3rROqcreRKln0W6IYigpfAKKp9JYpD9HDPLuwpkOjoDPPZg+iXKFYKU /D52xouQYguzhWC6F0rFFxJlsvkHA9oZHdVLzYJWwOrN9M2tGVFi8SODufU4mCVVILd0 mJydmga9nrrN1G1qf2tT/BgIQDXVgz5oodN5j4LT7wvsygKVpYRbw649OF89NdLC/vLo kANA== 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=q4BIeD8KB2TUD44jdP2PbIAGiDvzKnWVE6ct5fV5uzw=; b=AOmKioto8v+EQ8SJKyjwloLXjqcHxZlvCvcY3eUQZNxouHHXDl3dtplimQ3fpFkB7E PkULuOhk8H9Xzm2IHZlNDsjpJPG0MFr4QX0qfOEYmUnZwZGHGBiUBoFmU+tSPxI9/vJS sISqbOpUmB5rkzk/3mKT921Q/Z58n58zqpM9YA0ZffkthcHfShn58mlPPSr/JeYqKDwR qXqOtG/1n+6tBX+hqV8OIOCstrk2/WZpX/1POjtOLz0jzrVbTjBhHHTnxvipOJzFjWFJ Be+DTJpdyfO6BOOdDSk4riPA0cxqEyQ1JQT3oevzti9KgSvAprjO+vwy9ki7X++ov+1r anVg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id q142si455311wme.2.2020.12.14.04.28.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Dec 2020 04:28:01 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 0BECDYgi006569 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 13:13:34 +0100 Received: from md1za8fc.ad001.siemens.net ([167.87.44.172]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 0BECDXLJ021479; Mon, 14 Dec 2020 13:13:33 +0100 Date: Mon, 14 Dec 2020 13:13:31 +0100 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH 3/6] wic: bootimg-efi-isar: Add support for Ubuntu Message-ID: <20201214131331.31aac0a9@md1za8fc.ad001.siemens.net> In-Reply-To: <57c2d3cf997a0355af0dd04eb6b2924ac7920f43.1607929886.git.jan.kiszka@siemens.com> References: <57c2d3cf997a0355af0dd04eb6b2924ac7920f43.1607929886.git.jan.kiszka@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: 28RVhZneSsEq Did you check the custom kernel case? Do we not have pre/post install scripting in place which deals with symlinks? Or is this scripting just part of the distro? Henning Am Mon, 14 Dec 2020 08:11:24 +0100 schrieb Jan Kiszka : > From: Jan Kiszka > > Ubuntu places the kernel and initrd links under /boot. Account for > that. > > Signed-off-by: Jan Kiszka > --- > meta/classes/wic-img.bbclass | 2 +- > .../scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 10 > +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/wic-img.bbclass > b/meta/classes/wic-img.bbclass index bbf5dd8a..dedd2bf0 100644 > --- a/meta/classes/wic-img.bbclass > +++ b/meta/classes/wic-img.bbclass > @@ -99,7 +99,7 @@ WICVARS += "\ > KERNEL_NAME KERNEL_FILE" > > # Isar specific vars used in our plugins > -WICVARS += "KERNEL_IMAGE INITRD_IMAGE DISTRO_ARCH" > +WICVARS += "KERNEL_IMAGE INITRD_IMAGE DISTRO DISTRO_ARCH" > > python do_rootfs_wicenv () { > wicvars = d.getVar('WICVARS', True) > diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py > b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index > 2285d2ef..67efa52e 100644 --- > a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ > b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -65,6 > +65,10 @@ class BootimgEFIPlugin(SourcePlugin): # Create grub > configuration using parameters from wks file bootloader = > creator.ks.bootloader > + kernel_initrd_path = "/" > + if get_bitbake_var("DISTRO").startswith("ubuntu"): > + kernel_initrd_path = "/boot/" > + > grubefi_conf = "serial --unit=0 --speed=115200 --word=8 > --parity=no --stop=1\n" grubefi_conf += "terminal_input --append > serial\n" grubefi_conf += "terminal_output --append serial\n" > @@ -77,9 +81,9 @@ class BootimgEFIPlugin(SourcePlugin): > grubefi_conf += "set root=$bootdisk',gpt%d'\n" % > part.realnum grubefi_conf += "\n" > grubefi_conf += "menuentry 'boot'{\n" > - grubefi_conf += " linux /vmlinuz root=%s rootwait > %s\n" \ > - % (creator.rootdev, bootloader.append or > "") > - grubefi_conf += " initrd /initrd.img\n" > + grubefi_conf += " linux %svmlinuz root=%s rootwait > %s\n" \ > + % (kernel_initrd_path, creator.rootdev, > bootloader.append or "") > + grubefi_conf += " initrd %sinitrd.img\n" % > kernel_initrd_path grubefi_conf += "}\n" > > logger.debug("Writing grubefi config > %s/hdd/boot/EFI/BOOT/grub.cfg",