From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6906006289225089024 X-Received: by 2002:a19:6a11:: with SMTP id u17mr2804277lfu.184.1607949202393; Mon, 14 Dec 2020 04:33:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:10d4:: with SMTP id k20ls328306lfg.3.gmail; Mon, 14 Dec 2020 04:33:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgtrDUY7+egTbB8Mc+MsrQv11+FPZ7CWcBcGfdf2E7s+P7MbQJvgNNUBBBxhgBoUWBEs8j X-Received: by 2002:a19:651a:: with SMTP id z26mr9177494lfb.306.1607949200976; Mon, 14 Dec 2020 04:33:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607949200; cv=none; d=google.com; s=arc-20160816; b=IKRBbjqvdHKHm9eeIOkgb1JiRB3SoDz/QPGjU81GMOclrm5pilgx8xm2xF9Xu31fHK jQXXHeJrwRI0aESE9zu2GlFxCujHl+neS8JTdChaWhV1EcxqpwCh/oRT36XzO88EIp/u IeafFzxwF5obR8Yb4MZITxXBOzsFbv8gI2PG/TqonZbI7dYj22ylBxyy6nfDZ+fohkG8 Dj0UHTFkNrnrJeyBUu9+36xqLt945CO1RWaC6rWRTBvzEQRu1IzMgkSW7iz9wJpKTrWb CzbMfORzj6aV8+vSqlCveCGgmPSxw9qSmnIAQDQi1Wx9t4HQsYgQCjDWA/wXHZgrQBv+ kbLw== 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=W542OClA9A6CcUzRY1UpRZszLrId8fUPwtvYfEpknCs=; b=Nnjg5UxzU4HxNjbyjApGRWoMDqh93OhDw5zwf1vIQ3v7iRykhweKw08t2Jfrv4+wqk ckcMuCr3bhGqPRtARjhJGCuopdnGU42//I5OCFrfY/jskzwerf/xcuDqYK/PVh8By3MF 5Dud5iyXEFsOb6GkKe4gqbICDLabnu57QdahAq0FPhI4vXH9hSonw4wvydO3UBehQiRX +Ix17mdQOcvds67ZbDHTem20yUSxF2CPwdZ6Bd229jJx2Ok3gWE1uQjR44xVJt191qw0 lc5GMbp/UtMBpfw29sy3Crd5f4VjkDB3HzWYgLYrwB/klColOt1gr/kbI4V7ogbq8vf/ mF1A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com; dmarc=fail (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 d3si561122ljj.4.2020.12.14.04.33.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Dec 2020 04:33:20 -0800 (PST) Received-SPF: neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 0BECXK0V013490 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 13:33:20 +0100 Received: from md1za8fc.ad001.siemens.net ([167.87.44.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0BECXJT4008539; Mon, 14 Dec 2020 13:33:19 +0100 Date: Mon, 14 Dec 2020 13:33:17 +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: <20201214133317.0e559ab3@md1za8fc.ad001.siemens.net> In-Reply-To: <42202a39-4db9-2255-d340-64ca3195ede7@siemens.com> References: <57c2d3cf997a0355af0dd04eb6b2924ac7920f43.1607929886.git.jan.kiszka@siemens.com> <20201214131331.31aac0a9@md1za8fc.ad001.siemens.net> <42202a39-4db9-2255-d340-64ca3195ede7@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: QVvzq4gL1IWK Am Mon, 14 Dec 2020 13:28:09 +0100 schrieb Jan Kiszka : > On 14.12.20 13:13, Henning Schild wrote: > > 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? > > Yes, see https://github.com/siemens/meta-iot2050/commits/jan/ubuntu. Sweet. I do not like the distro (at all), but i like that Isar can cater for it if need be. A few people seem to care ;) Henning > Jan > > > > > 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", > > > >