From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899340313789202432 X-Received: by 2002:a19:cd6:: with SMTP id 205mr1406197lfm.117.1606401347797; Thu, 26 Nov 2020 06:35:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:58ed:: with SMTP id v13ls1423728lfo.2.gmail; Thu, 26 Nov 2020 06:35:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLflusfUpATBW8bOgPu7zAdGMRaInTIDFRYwGVQOqzSz5SnBvnqaDhAYkHQHomxAcs4ogz X-Received: by 2002:a19:e05a:: with SMTP id g26mr1601650lfj.190.1606401346767; Thu, 26 Nov 2020 06:35:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606401346; cv=none; d=google.com; s=arc-20160816; b=Hl5b84UQYdj600e7aNMCeDNqyaM4FbHui1PjV/JyhOdsryOPV9g45Dx/BzK4jY48SK SGZFCqW87dzZ0uvw9hoytgE/NLxVJYMhHU+4jlEjOUj+5lrg+WmxFPMPgxOIk7C0/ZrX SDfbY7aKHyqx2dyNy2jR6qqzIMb5lCTiLuraLdRZ1to8HqjNOB1Mqy75kN/ldsYF9lap y4jDT7TeZ5f4+Kee6OiP1XJPwdk2lUwxJ9pDAlrfuWhNIHkVvx+ppic8RqANAlO7MZFm t4yvpyWn6x+2V1suRNlZ9wnaW21a6l9TZkVTQQNr30lNc2nDO0YG2l+kCqFnQpmrEgND kt5Q== 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=8ew04lyRr0Q9VhR2GBLgwCUaANK7f6FLjT8Pk1kZFyU=; b=FlbKwV6B2J7HMiMZwE9j1hl2AeDsnmB0HXquPj1zmglCMzGduXLdicFiTBgQBDMK0S Kcg99MdPoaq0k5ALhbwREeu3XdbtlIZ2capQsVeKBnyOkmDTvEpcCdr4Z29GdrYStYJz htEVfLgJr9tfm0gmuaN25yyz/+0aB2XwwVCyYrk/zosF3GWtEOoKJmyWlQnHM5wGy8y4 QCHiXs/4G5/0n4ZA0OHtEO/Bj9WCOUcj6KF8mmEPs61FCReIvA9I/jNrqNYvnxzluSRn fewxeQXACY9TsFNhTsE/b4WHFxqiHLKctvJL7eq9BdGSOz6T1I4U9F2R8161Yf1g6dcK 0fvA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id f9si63747lfl.3.2020.11.26.06.35.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 06:35:46 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 0AQEZjMX016686 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Nov 2020 15:35:45 +0100 Received: from md1za8fc.ad001.siemens.net ([167.87.18.243]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0AQEZjln019244; Thu, 26 Nov 2020 15:35:45 +0100 Date: Thu, 26 Nov 2020 15:35:25 +0100 From: Henning Schild To: Vijai Kumar K Cc: Subject: Re: [PATCH v2] wic/plugins: Fix boot plugin Message-ID: <20201126153525.34e76854@md1za8fc.ad001.siemens.net> In-Reply-To: <20201126091750.28048-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126091750.28048-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: aLKpEVKOV10W Am Thu, 26 Nov 2020 14:47:50 +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. > > [1] > https://github.com/openembedded/openembedded-core/commit/9256b8799495634ee8aee5d16ff71bd6e6e25ed4 > > Reported-by: Henning Schild Tested-by: Henning Schild > Signed-off-by: Vijai Kumar K > --- > Changes in v2: > > Address review comment from Henning. > - Dropped --use-uuid from common-isar.wks.inc I think this can be merged. But i am still not clear if that is all that we missed to update in the forked plugins. If it is all, good to go! If it is not i rather wait for all the bits instead of merging such a hotfix, which in itself might have unexpected outcome. Henning > meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 3 ++- > meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > 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 > 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) > > 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)