From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899340313789202432 X-Received: by 2002:a17:907:2631:: with SMTP id aq17mr1684755ejc.497.1606379996511; Thu, 26 Nov 2020 00:39:56 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:b2cd:: with SMTP id cf13ls385037ejb.1.gmail; Thu, 26 Nov 2020 00:39:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2bKm3DHpi1TCbscXborOcChtUOVIbwAb9quKg1eTXH06A3W2zCkN7e5tuTzLB/R0+3SfZ X-Received: by 2002:a17:906:a88:: with SMTP id y8mr1770389ejf.469.1606379995810; Thu, 26 Nov 2020 00:39:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606379995; cv=none; d=google.com; s=arc-20160816; b=W2EgznponXMtVHnIt8YsZZB1EHBEuPr26Lb+YAx2MOwX0yKDpqhET0heibKB666W/o OvlXuPhqin4sfT9Fmv9fU3LaafKoX9o+4soAaEFqCxnzSz06B9ZzehfRekFNjX/ewwML XoFn8L0/kuFrBPG0HPVLeCTDBYifChidZnXLl3qGS47GI3pYhWU/GI6GFUDHOZmdYFS+ FV/u33kK9MSwIXfoPo+NZGI5ISP3/vM8aCJp3X2rwddhkx65R8WrjX/XwtvoGWJk3fFl rp/E56yuQEcsKXkY/vbCwCGWOgACzBQahchbYQoWDatPi9JkJKLWEjHJ2dIMTcF8ollf NbRg== 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=m23M9DNrbSEaXBZz8orecx4XZbe5cHOEo5IicRQSY6o=; b=Z5PRF2fhLSInj9Ke220ckKUX18qbmMSWj/LXUFkP4Y7nfYE4Wm8zMDJQgDmpy9Vcd3 wyf0UDY9AcNIhCTUQvcz/SJTZnOVgIa0eTFUju5fhgtNaO97jVbacEVoG4vN26HXe0u4 abP4ba1MdbVFie49BjBO7Ky+vMutkJaQ5tzNqzEYp9o1ImsgohRY/2ATK8OpN0Jw+tKw y5n4sPlrzUF+xDgGPxrCLQTAaNqb/yE2Ku2E4npa9oo1j4P7Ta1801PqzZKtZnJPZxl+ 0hrGoGrtpUtUIl7oFpFKVEjTBQdxWNIx0LItVRde+umf3zsqPMm4iYjKcURlB5liP6oR 7S6g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id bm8si160991edb.2.2020.11.26.00.39.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 00:39:55 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 0AQ8dtBG022463 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Nov 2020 09:39:55 +0100 Received: from md1za8fc.ad001.siemens.net ([167.87.18.243]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 0AQ8dsSe000527; Thu, 26 Nov 2020 09:39:55 +0100 Date: Thu, 26 Nov 2020 09:39:54 +0100 From: Henning Schild To: Vijai Kumar K Cc: Subject: Re: [PATCH] wic/plugins: Fix boot plugin Message-ID: <20201126093954.5920b387@md1za8fc.ad001.siemens.net> In-Reply-To: <20201126080328.26721-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126080328.26721-1-Vijaikumar_Kanagarajan@mentor.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: SlLG1tQQzTl5 Am Thu, 26 Nov 2020 13:33:28 +0530 schrieb Vijai Kumar K : > When we use --use-uuid along with bootimg plugin, it is observed > that the uuid updated in /etc/fstab is not same as the one the > disk created by bootimg has. > > The latest wic[1] creates a UUID for use for these plugins, our ISAR > version of these plugins were not consuming the uuid generated by > wic while generating the partition. Instead a default volume id is > generated which is different from what is written by wic in fstab; > resulting in boot failure. > > Fix the ISAR bootimg plugins to use the uuid from wic. > Also, enable --use-uuid with bootimg-pcbios-isar plugin in > common-isar.wks.inc for a testcase. > > [1] > https://github.com/openembedded/openembedded-core/commit/9256b8799495634ee8aee5d16ff71bd6e6e25ed4 > > Reported-by: Henning Schild > Signed-off-by: Vijai Kumar K > --- > meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc | 2 +- > meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 3 ++- > meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py | 3 ++- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc > b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc index > cc38a01..4290edb 100644 --- > a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc +++ > b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc @@ -1,3 > +1,3 @@ # This file is included into 3 canned wks files from this > directory -part /boot --source bootimg-pcbios-isar --ondisk sda > --label boot --active --align 1024 +part /boot --use-uuid --source > bootimg-pcbios-isar --ondisk sda --label boot --active --align 1024 > part / --source rootfs --ondisk sda --fstype=ext4 --label platform > --align 1024 --exclude-path=boot diff --git This is a deviation that you needed for testing, but it is not what upstream wic does. I would suggest to drop that. > a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py > b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index > 2285d2e..6b2fbc2 100644 --- > a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ > b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -276,7 > +276,8 @@ class BootimgEFIPlugin(SourcePlugin): # dosfs image, > created by mkdosfs bootimg = "%s/boot.img" % cr_workdir > - dosfs_cmd = "mkdosfs -n efi -C %s %d" % (bootimg, blocks) > + dosfs_cmd = "mkdosfs -n efi -i %s -C %s %d" % \ > + (part.fsuuid, bootimg, blocks) > exec_cmd(dosfs_cmd) This seems like stuff that was forgotten about when bumping wic, right? Maybe worth diffing our fork plugins with their originals, in old and new wic to see if anything else was forgotten. Henning > mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) > 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 > 493615b..b3d71c5 100644 --- > a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++ > b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@ > -209,7 +209,8 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): # dosfs > image, created by mkdosfs bootimg = "%s/boot.img" % cr_workdir > - dosfs_cmd = "mkdosfs -n boot -S 512 -C %s %d" % (bootimg, > blocks) > + dosfs_cmd = "mkdosfs -n boot -i %s -S 512 -C %s %d" % \ > + (part.fsuuid, bootimg, blocks) > exec_native_cmd(dosfs_cmd, native_sysroot) > > mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)