From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899340313789202432 X-Received: by 2002:a63:6585:: with SMTP id z127mr1916343pgb.210.1606382294202; Thu, 26 Nov 2020 01:18:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:2a8:: with SMTP id q8ls673282pfs.9.gmail; Thu, 26 Nov 2020 01:18:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxTxCDRsDGDyrKFvMx8XHMPszSAC09oN3X3GjrqM4OpCQWwWtL4/D0+MECgyfY/9VBQm1Wu X-Received: by 2002:aa7:9f8b:0:b029:18b:9c0e:a617 with SMTP id z11-20020aa79f8b0000b029018b9c0ea617mr1953006pfr.16.1606382293389; Thu, 26 Nov 2020 01:18:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606382293; cv=none; d=google.com; s=arc-20160816; b=swz0U+/Wb4bGn3ELcu3Mp1MaJxfF88F6Fyk4IEJIFtG7m6a7xtL2xzO4u2nGh9oapJ 84I31Gd9G4qwp+aiaWMjzpQRE+HLf0MKsM6N9baA2rBYQMv8dTegi81cyi53vweq8DIK uXd7WZDM4gCCG35uy/JVRAxp1IEdwn6jFVTE53wMSKLIPSSZmvBj+Vzz2Mv2TkUxuyVN c5+ctb03Jj2BosxXhkY6F7xawda/++X/3XviAnYunJIlWwlRded0Dm2dkHuVDI5Yfw3O 25I+NMrb1kpfanQA4xBQVzn34xc35wDyiHflJswKOY4d5MsuDyPgy23zkkhwFWe8BCD5 lHHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from:ironport-sdr :ironport-sdr; bh=o31HhhbKvaHBIMs70b1Wvo6PghjI3eoIhllgYz7fWDQ=; b=WZytpLcj+ANgMIYk5FFjpZEmJWZ6Ik8muQecNgAdSe5dgaTaz8QydF2R5UU0yCp/NZ lNE8Ldjp8ub8Sx6XXBJfPXOj/kbVeFAvZ6dsmXQb9lvcklYeDQPJGyb4iLh+aIrJrDGq kTtNC0tmgAnmcUaJ/TTKepFLV3G1p5jVPgrWsulwFCeNBKKaizW7Kb15Rud4Mt7MkHXO ezxp2aRBw9rF36kFbW0A8vaMaotovSVlHc2+2qIRaga6jH9s+iBpwk3G7H5ge7t3xNkN 4Pcnutz9AlLeimZqgrdT9tRNIUrZTswa6T2QvvG+R2cHkOg5nzvDkarvnMXctBDvjPEH 9O+A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id gg20si453835pjb.3.2020.11.26.01.18.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 01:18:13 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: 2kOz4Nuwfrfdcpl30k2xgINOT8LlNZY0YGHyecaW16eJwG+u3BD7OTK5i4ViOfxqTIMv85PyKG wbxrG1w7ZNZAUL7W5vDqEfSvdeW2kr/lMrU9CM2E4tB/TsSBrldwledMgGzZtOMIPb2Wh4/2I1 Yyc+lu6VRwRTqBLa04dB+K+zHDZA2qwvhtcv/pFPM8J8Z4x+oHfBhk76BM8BHUQzfSdRgMcYyt dCxkSqRS/p5BmTV7hvtceTS5gC6MOwlkTub8/T6/5c5Deu0iEN0bFz00h+Ar89yM7t4YMWyGVb U38= X-IronPort-AV: E=Sophos;i="5.78,371,1599552000"; d="scan'208";a="57801500" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 26 Nov 2020 01:18:12 -0800 IronPort-SDR: 0tnBRi+sh7QuK2CgVPxtXTUfxohRru7G6NfG87VjABIlJHQ0jaWIGRG8VFkZU3rQcWQA7TBeKz mOhtI3kchMAxieZ3P7mII5SHp6lnSgBHTlfNIrPwQxV/e4kzrYBK54vXEQ2PmaTJQPd9tGmK/s V0T/LocvkIfJpqlph+O+Uoy3QYi1VP7RBa70u9PKO5NZd5Sdh6qjpPTJJzV7ETteDGQpjvUE/Z QRgyPbLezJqNs2KnxrrBKw/V6LHt/pmntfSZmWld7B8JeHmm2VkFR09eqLJvfURLIJ/vl8DCFB a98= From: Vijai Kumar K To: CC: , Vijai Kumar K Subject: [PATCH v2] wic/plugins: Fix boot plugin Date: Thu, 26 Nov 2020 14:47:50 +0530 Message-ID: <20201126091750.28048-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: FaAadYEE73oJ 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 Signed-off-by: Vijai Kumar K --- Changes in v2: Address review comment from Henning. - Dropped --use-uuid from common-isar.wks.inc 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) -- 2.17.1