From patchwork Wed Nov 25 23:17:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 222 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp1148829oou; Thu, 26 Nov 2020 01:18:14 -0800 (PST) X-Received: by 2002:a65:4809:: with SMTP id h9mr1847073pgs.194.1606382294479; Thu, 26 Nov 2020 01:18:14 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606382294; cv=pass; d=google.com; s=arc-20160816; b=NwO9msmuSURzD5AD1OEtVVVVGaeB0DXr7ZJA5evyMD6n7e6Zy46wMrLb2DpnHTuP7r cei7E4mNzdcKT8ZeK15g8CdBTcvXOzURiqVXxOSfeFgqP+dn7al/+GHlyXlgxK4Ld7na GMhEtQXuntASjmd8GCSdymRMb4FIkp3SzaHn95uBdCfVD+3/atA7cxRZL5f26FllYNrm FMF92nmr4WXs/5QNk2EozMkJXpWEkmhaPT3rJzwVJ//P0gRGLPT/iGipiBtwLOXiFKgI zSEQYzA0i4Q45jE8cEp/xNuPN3JAFBtHwEkImO2keWErSWfcXkhhfJNmbIhmUto4IXxS 2ByA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr:sender:dkim-signature; bh=cbGxniY1trDCGKQOhFm2WnVPhQQij2zc8NSwwVxPDc0=; b=tfhnrfiRQdC08NEo/hvcMs1S/QOqbdTh0epPYjSH6+0rNzOFFe94l1IJwr2S9V1Psh yjYymavh79Gt7gJc202REKiya0H3gWe2Utp/bgJpO5bWgz/EDCb9NSfvXVp69AkIBLNZ bje58ajng91am+NncSScbOox/CTH2f/3+anLPAyM0dl1IjcKZF5H/yaGJ3NiTQrDnDsh gp/G9XdwQ8+hpRMa7LBc118j7FfA0YH9xtSrApKL7FePjiygvIbs+ldngeQTDyv2w3Cn cuNrC7K0/czQGsPmXMwm2zI8l0atB6cHh3kaw1MnKnoriDNn083Xrk1UtjZRqWRWHVcU 1o0g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=gBk4yOY9; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbvpf7x6qkgqekieu4ci@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBVPF7X6QKGQEKIEU4CI@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id 2sor2150709pfu.99.2020.11.26.01.18.14 (Google Transport Security); Thu, 26 Nov 2020 01:18:14 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbvpf7x6qkgqekieu4ci@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=gBk4yOY9; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbvpf7x6qkgqekieu4ci@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBVPF7X6QKGQEKIEU4CI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606382294; cv=pass; d=google.com; s=arc-20160816; b=dwUzvpnuW3WLuKrDLJEEwKPiZWSHoy6CEJEuK4UvNkvzhiNqL3+vyX9eArR4tIR9io ysj8KfaaI4iiAdR2qibFkjp5SX2pt8hlYoCo2hlycJbVUleg9/RCqnWCh3HDpkmydQNh 7AXPPpRT/OYliAQRpbEdJ+Iq29OjSDtWM01ZM2vHibOSr1w5q9rq6wp3jgo3ZqyhrMC8 4UlXtwknjICFboaMHmKhinPLov1Tmc0xZOjmXaxgKcH9uk3qwt1L+84dXs3DnhvuGIb1 Os2VoMSAg8+sl0CebXe90Q/RRfqr3l32y8F08aRHR/6d3gRqMHCVOV/Cj6cODBCa+j2k DIEg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr:sender:dkim-signature; bh=cbGxniY1trDCGKQOhFm2WnVPhQQij2zc8NSwwVxPDc0=; b=0mvjk6ABtO7Lp5Au77se8jono9uE9xWB+6zbu3BGuTZWlTWgiOtrUyPg3Fw+odBgz4 ffrwEzFlbmfYG+FL+nym6MnFH7qWHgQ6JtmSezloiVk4irxjiRhdwpnL3FYfXMIrwgkj LlBaXywzSue8zRDXTw980pPezcqjdbLzdQ5gbTKAhEBNyi/8k1V8azO6N+8UwEyo7rJe ObRVGPAGiD/AirUuqyndTOi/UlxeT1MQ2r3FGZwHj3MVq/B3tBfW/vHT393ueM3lVw61 8aSOIecynjK/ve96NDjkvuGTHblur7zA048eLbs4X5KbRAOTKRuYitRzdgJoNTittlsh xWQA== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=cbGxniY1trDCGKQOhFm2WnVPhQQij2zc8NSwwVxPDc0=; b=gBk4yOY9gzAQxnWpUaI7lnSdiyO1XDDnbPMWZOndXLhJ//OtuYgCnVgVH+YTmcFPSE UqZiiSFrnbNaqDV+M7hgy60asQ8Y+yiUwM4CR2w93BSpCz4BEWXYExs+YhC4GooJZNKn fi5vKIMDOqy1FEW9vWnXW22MaNQd7AUGrNFvKm8jGqsOOS8SE1HB9okBsn7zXnGALv5L AK8VRgQGJOIRbSWEcJEs1UkmlAl3Y7GQK23f92+RJuVBnmiWRCcdRoj2JJW0IYP6ZkQ8 8FTyNNrifjlQP1+8nyfISp7Lcj998ChSLZf2UXRTqOBYVwNXVLoM+b+tzSjcTe9FRtUB CdNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=cbGxniY1trDCGKQOhFm2WnVPhQQij2zc8NSwwVxPDc0=; b=ImmfKxX1dPbSo7FrJ4z5ZSadQc6iXqvXFUjMG+C0eP2XvWt3OZGW3aYFonBDNDuS5/ bop0GeF+XILgZOqeg0hJbDJ9JfagiuUeiQWd9EY553oEC9EhlVWxoLIY+/ijSPstcDmM rzHgoBcIwGzJ1Ra3UF+vbiyhO0IUSSJTF+BaXhsq+f3hRMQFtvLM4Ez0RQvyV3IseUZe mILJDt+EmW6ribKa2Y/I1Q8Rtvmsqo8eDUnSStmBquX8c25MYnHTTKgiq2F5gTM/HC8S yTRBdc9YtUqX4SegES9gwDFx1+V6HDn9oNZvwqO5no/zm7SKEEloeGZTdFg22DV9LMtn ED5g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530PQzNIUAeoJOuPYXex2iwrGtUtnxMjRQizL7dKKa/yBx27Aanr 6IdcDzFSLmcGVPloaeNuALI= X-Google-Smtp-Source: ABdhPJx65M/134YyJpqvq+gde+w7ltrq+WiQeL6M4C0Uge4D+jmkAGPRdLeHr3yEu9jhIoX7gDRStw== X-Received: by 2002:a62:7a47:0:b029:160:193:76bc with SMTP id v68-20020a627a470000b0290160019376bcmr1976361pfc.24.1606382294091; 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-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 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; 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 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-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1684413920491514405?= X-GMAIL-MSGID: =?utf-8?q?1684413920491514405?= 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 Tested-by: Henning Schild --- 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)