From patchwork Fri Apr 10 09:08:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gourav Singh X-Patchwork-Id: 5028 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 10 Apr 2026 11:08:54 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f60.google.com (mail-qv1-f60.google.com [209.85.219.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63A98rTL031347 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 10 Apr 2026 11:08:53 +0200 Received: by mail-qv1-f60.google.com with SMTP id 6a1803df08f44-8ac04b2fc4esf54374816d6.0 for ; Fri, 10 Apr 2026 02:08:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1775812128; cv=pass; d=google.com; s=arc-20240605; b=QE3IMbCMdnujYYOBdOy6JjCXbTy6uAtZSPtgOcNLffmVrO+khwwHIzhBypdt0lrDtP a3eXoS9rutzGjnym5a2OStRFoLiQr/7KwODYxatcpAnrVGKs++8zIuIJBygOyaOgoX1U K0JAjcDMCvyH7LZP7Ao+QEhntW41bkfMSNRc/mOZ3tvZ++YwClUjmPaNpc9csZGblAzh LZtNGpN6CTRYnpGq8enZ1pCmuY2dx3tUEt+hKz0dZLwzgSBVNxaVP5a21+TFbrCVsbiO /EI2sK00xvPxrqACAX/Bq4sb/c0JZ2M6NioKgTyIMHHInjcVpV0zx4Av3vxwlQr/N4bq dX5g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=DXYCZhkw4+BJ4IEMNhei98vB41yrDaAzcZ8HjJu9obc=; fh=smpa7MoTfhn8+do1ciIndnuopnoFjzT7x2IcFd2sEwY=; b=MP2luGiIIzxpRltWf8WlZ4sL1uCHBdsjhdln6/gInT+owVkJ6/rjeWZKj+jLHRRUxu Dyf1pLgoNDQSp7ySIvcKgNb9uf6JShsP5Lo5nIfKhr4CTYoBCUL9yPbBHAdI4d1XeXEH SvtO5CU3I+BuEeHZpz6nKDfR4xuQ7w5wazF3iNCRPh42T2urlIlpqzBGPJb7GCRMUohV 21BuLXyYm1czZ+4KBGtNpsJFHVi3DOt47lQRa0NzEK4OtOVOzdtBnDr2UX9kD/mjcZ78 cNbgGWzTiDEOVo3i7FlDfIvxQRcRk6t4qyyrVgDhBBS8+eqDDAmcN48pJ+P/a60swYBo 7mCA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=VRiyiKCH; spf=pass (google.com: domain of fm-1333022-202604100908454a656b2fe300020776-nhoocq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1333022-202604100908454a656b2fe300020776-NhooCQ@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1775812128; x=1776416928; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=DXYCZhkw4+BJ4IEMNhei98vB41yrDaAzcZ8HjJu9obc=; b=dm0DYic9N+hA1mMCgEjBWb8Lox7Yfo61KG+JWZbMM6EujJnXSj5Q4e/SLArGkEtIZe YjH7LPUG+fTSWOkHj6lh2/CMk0bB25euNvwZBZj+z74WMjrVPIQOMR+shu4T/90sff6e 5WemZWZpL3CAMj3M/u/RyCx11grUm+dXv8c/JRcEP/6t/SdMHCWQtTNZ8egO9I8Bm56J 2R72m4mZfqFqrw4MuN8xffjNLstPY/vE1BqP/YAg/WoWkNDCHpvIu20SRm0m5r6q8GPX XdJjAgzcd0DkAXSD0e2eaEm4CudHuTvemhfiM3F+fTnT9RRYdyDpmbxwn1Udq1ry0IRl j5gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775812128; x=1776416928; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DXYCZhkw4+BJ4IEMNhei98vB41yrDaAzcZ8HjJu9obc=; b=b7U7YYCsBWWpMF9cQQK6w7jye20T+Hh6ldGAw7HlujeWBBz5d+sqbin2l8by1U0Po3 praB/GmcLQVhUQ3cVJ9pjcrGQGYWtUsEYcyGBda8eRB9Id+DTRlUSEBqj1307Fbl90qW fVEIUxKcw1JBZOyfpi480vyknSeoQ63JFZFKgfflKUWv7HY+r8HcSeOXAyuhQBN5dNqD SJIFLATb33fIh62cBycNEg4WGg2JzhJk0nkyuE05wbhNrw8632LMQ6+g7wfvbwyNZ1bl AyrAwvTGKlndz0RZnRYV4Eq3nsDb/uHmE5337ZhWNU68a23kbhV/K6ZOKwu/JfcUE3Bj 8CPA== X-Forwarded-Encrypted: i=2; AJvYcCULiNmfLKH1Nb5jLC90Z5AOxDlDdCswZRvAxJMCC5BH5WLdbtCEJXgPwsuOp7IfuNpiODiui3A=@isar-build.org X-Gm-Message-State: AOJu0Yx4NMFZvRnkm9553RIvc/fHO8mymmuP5vSQz+yJbqJvD0V87+po 1dYqoy0ub9YwMiAapsI46kJw7MkJjyTsKYXKT+UKcSiZMEPGDCXmnVak X-Received: by 2002:a05:6214:c2b:b0:8ac:8337:ca08 with SMTP id 6a1803df08f44-8ac86245532mr34198626d6.51.1775812127466; Fri, 10 Apr 2026 02:08:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiLR1YUuIs1ocQ95byCkgHLVpjCCzqSY/NXTQ/rAttDuaw==" Received: by 2002:ad4:4eeb:0:b0:8ac:7f7d:4a02 with SMTP id 6a1803df08f44-8ac8347ec29ls13267736d6.1.-pod-prod-03-us; Fri, 10 Apr 2026 02:08:46 -0700 (PDT) X-Received: by 2002:a05:6214:4c92:b0:89c:4ea7:a705 with SMTP id 6a1803df08f44-8ac860f3ac8mr29485186d6.21.1775812126507; Fri, 10 Apr 2026 02:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1775812126; cv=none; d=google.com; s=arc-20240605; b=FvjW+gHRXfnoQZDzdRIrMVqBI+WBlPGsbzmSiejW1y7kBIg3zEX/SFz8ewG+JC0iNK DhxQShvfXPh3TMYNNDUPzNrMeNodyvMx3N6HeVpnZbrESrqiCNdtU6eb4bJHo3pC5GJu YsGj8pvReetq+ahjPYaGZ6hvlH1Apix5a4oVTfDmpTqW6TrueKCUQdSHYSLauEk1I28C K7QRA2SKMcxabu3gfP4aH52IFccBw9RdDFFs2bY/0vakY0nJvttRTVoSrs1+veIiZI8w O0OY+LpjjcxXTiQ5EJzwzcvwJvkmIK4WFeDPVXyLRjLjC+gUUDb7rXPiMUGaTLd+9mf2 oSYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=/cxQ7PFof3o8aZ94FjrNRwUXUXfNeWS9IccS9o56neg=; fh=F5B7sHw8QSYpzAgwBsAEFSY7gmjvHKn1s8Oqz1DQh58=; b=Rtzi1rVuTAvWB7IP6Hice8MJHQ/kD9oUN/Fc2C73LCNwVhkMYIb0rhTQslk5YK+rZE eG5uQIAHSPr1B2BNpehEokNwFoCxBZeuUoFOeDf9Ss/3ebL/OMP2ZledR9Jrf2vez2a4 vnuL4OeMEUYxmWjXMew6ohXu+yOgoKiOsdXcqe8subK8VNb3206ZLzVZs8N06mHx/Efj aVt/6oZF7WAbY7qwD12VLxf7+287DLs0pjMbbr29ms/oT24a02wodxkxbDbABX0II3PU sC9Ah4hcxCha41uSQDPOctEJbTRD6TJPh+fEVhCPLQt3fUcMQKIBAMkfXqpKXwoiGy72 oUgw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=VRiyiKCH; spf=pass (google.com: domain of fm-1333022-202604100908454a656b2fe300020776-nhoocq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1333022-202604100908454a656b2fe300020776-NhooCQ@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 6a1803df08f44-8ac84afdbfdsi720956d6.3.2026.04.10.02.08.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2026 02:08:46 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1333022-202604100908454a656b2fe300020776-nhoocq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202604100908454a656b2fe300020776 for ; Fri, 10 Apr 2026 11:08:45 +0200 X-Patchwork-Original-From: "'Gourav Singh' via isar-users" From: Gourav Singh To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, Gourav Singh Subject: [PATCH v4] wic/plugins: gate root= with creator.rootdev for efi-isar and pcbios-isar Date: Fri, 10 Apr 2026 14:38:13 +0530 Message-Id: <20260410090813.3501355-1-gouravsingh@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1333022:519-21489:flowmailer X-Original-Sender: gouravsingh@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=VRiyiKCH; spf=pass (google.com: domain of fm-1333022-202604100908454a656b2fe300020776-nhoocq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1333022-202604100908454a656b2fe300020776-NhooCQ@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Gourav Singh Reply-To: Gourav Singh 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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Checks for creator.rootdev not being None were missing and would cause the kernel command line to read "root=None". When using the Discoverable Partitions Specification, we really want no root= parameter on the kernel command line (and root=None is anyhow not a valid option). A patch has been sent to upstream OE wic plugins to apply these changes: https://lists.yoctoproject.org/g/yocto-patches/topic/wic_patch_wic_plugins/118740415 Signed-off-by: Cedric Hombourger Signed-off-by: Gourav Singh --- .../lib/wic/plugins/source/bootimg-efi-isar.py | 7 ++++--- .../wic/plugins/source/bootimg-pcbios-isar.py | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) -- 2.39.5 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 6bc78d42..d68a8ff3 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -104,7 +104,7 @@ class BootimgEFIPlugin(SourcePlugin): (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) label = source_params.get('label') - label_conf = "root=%s" % creator.rootdev + label_conf = f"root={creator.rootdev}" if creator.rootdev else "" if label: label_conf = "LABEL=%s" % label @@ -201,7 +201,8 @@ class BootimgEFIPlugin(SourcePlugin): boot_conf += "linux /%s\n" % kernel label = source_params.get('label') - label_conf = "LABEL=Boot root=%s" % creator.rootdev + label_conf = "LABEL=Boot" + label_conf += f" root={creator.rootdev}" if creator.rootdev else "" if label: label_conf = "LABEL=%s" % label @@ -366,7 +367,7 @@ class BootimgEFIPlugin(SourcePlugin): with tempfile.TemporaryDirectory() as tmp_dir: label = source_params.get('label') - label_conf = "root=%s" % creator.rootdev + label_conf = f"root={creator.rootdev}" if creator.rootdev else "" if label: label_conf = "LABEL=%s" % label 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 d5040b72..e12cba83 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@ -140,14 +140,21 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): syslinux_conf += "KERNEL " + kernel + "\n" - syslinux_conf += "APPEND label=boot root=%s %s\n" % \ - (creator.rootdev, bootloader.append) + # Check if rootdev exists + root_param = f"root={creator.rootdev}" if creator.rootdev else "" + + syslinux_conf += f"APPEND label=boot {root_param} {bootloader.append}\n" # if we are using an initrd, smuggle it in if initrd: - syslinux_conf = syslinux_conf.replace( - " root=%s " % (creator.rootdev), - " root=%s initrd=%s " % (creator.rootdev, initrd)) + if root_param: + syslinux_conf = syslinux_conf.replace( + root_param, + f"{root_param} initrd={initrd} ") + else: + syslinux_conf = syslinux_conf.replace( + " label=boot ", + f" label=boot initrd={initrd} ") logger.debug("Writing syslinux config %s/hdd/boot/syslinux.cfg", cr_workdir)