From patchwork Thu Apr 9 09:33:58 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Singh, Gourav" X-Patchwork-Id: 5027 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 09 Apr 2026 11:34:23 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f185.google.com (mail-pl1-f185.google.com [209.85.214.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6399YKaq025797 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 9 Apr 2026 11:34:21 +0200 Received: by mail-pl1-f185.google.com with SMTP id d9443c01a7336-2b2454fc131sf14209185ad.3 for ; Thu, 09 Apr 2026 02:34:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1775727254; cv=pass; d=google.com; s=arc-20240605; b=Qd8Cp6FDFn9+GDFocerlonPBJGdpzSrtN8oX2W/WJzXEVul5T04G7RJeiUa3OnA8Bp YPP/ZQ5EEgiIVqBDmCWNQ4jaksgU9gEFkKuMNWM1d4gr1hVExXrGJIUAnTZF7wY5ngQi VZHffmgbpF8rJcIW7DBSXETptiXzLtNTxfa2VT2yBVJfEnhx/JL/eQvVwWzvOVMfD4Vg NfuOcw2Vl3vK5hRHhQDSd9tTbtUqEC1L1sC7P3kXfZhrg+7DGQZhOCa3hVgX48zGAEtZ mBHVHmNbunPGga94KbREvM51Kbz1kndwHBU7LVdPNVpnFjNLDCv3CYQ8eR1rDtZmrhRF yK6w== 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=RJma5Rkt/SxVtrR9wc/cY0krjhN0bEQaWycQw23CNOA=; fh=E+iC5bhlj4cLFn/L/as9Bd8W7/VrdSVEWDIIJ5jffTs=; b=ijF6ilONKRK8UV9hLHQ+05ZobXFkmVOqcAZZi6fjsavjftFxxwZn16KgB6IcPsMA45 bu7+7YS74cklHtDfj1HRITFPornwLiuY9QQR22bih03JP08U+pQUdXyLD4waFvVzf05U s5QmjJCnFWmsb2X1bV4KmnpPB1lmplUj5bxqHBAb5jPKvOuD3k7pM4YlEJp+K/NWY1kN 55dHewdHzWfbvUw/qWWGVkE9Q8uDjeiG2xdBEyeAeaGCS4AKVqB/EZfvTXVGOHhE/hJu IdGd7s3sd0cXz7ESDsks3qDdwUptcREVH6C35w/dmVS590ocI4XEbjWXekwcZmIcL7BO b7qQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=MwO35uYL; spf=pass (google.com: domain of fm-1333022-20260409093410b12c3ddef50002071b-q__jog@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1333022-20260409093410b12c3ddef50002071b-q__Jog@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=1775727254; x=1776332054; 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=RJma5Rkt/SxVtrR9wc/cY0krjhN0bEQaWycQw23CNOA=; b=vKYRE47/6iAJHFM/LPpgGB4NYepMI6gR5Drh3Q2pDcKa6MfmqWje/gxLXLbYkYKlPB PKz3LTMZjA+05plcodR/mogQTM6iwsBwFAXE7Ilc5r+kkdmCjbOFD6Mq1wSnLgsckt0N kNDbCJDStn3JcMLBJJDv+Tw5AEQK5i+3iCCa0V6WWI/8id8Xe/+RGPZnhoOnda4CNxf+ WqoAo/sjmGCk/uYAYr0WKxrxgnclJLJmv6ELp/1sLYlHyytAlz1iXfZ2xslyvDipTdEP 0GqJK7JVCBZRB6f652YlfCxyummcOAv0PdDTVX9Xvq04QddkS9uM8NRaiFoaPcbnTD5R i99Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775727254; x=1776332054; 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=RJma5Rkt/SxVtrR9wc/cY0krjhN0bEQaWycQw23CNOA=; b=I249OBFR21TyUvSy+x2EKloFXyeBHo3AQvbjA5fdypNnfkxl0lx5bUzxQrwTFSTKYH zB4gl8TOxuiHLZ5QnTV44AgxdvZpH0Aw8Eed5m5bWlH4Q1/cqirAUjCp68qFH3/BfW1S x0ARk+bjuMwb408pOD8evNnd6wU7A78ddz4fJp1EqFppYzsdEXUbqC1gDZWiHXA2lWeq XqZGKE9vDIMnD0x1oB0SNzaGgNmYl9QlZduUyuNn2R5wVmENAeASEF5Gtpk7zmBvicZC 7SNpzUKPrvBZtmTsVi4YIg9NkqObBgbotXcAhat4n2r6+mJVOFjHWzG1O6ps33My445y E7Xg== X-Forwarded-Encrypted: i=2; AJvYcCVbBFPT/kb3rho50CoTI+dYt4uutijDBJbNzAws+HvSalu+CIjfX8KrezwtMRtyI7uPFx83LtM=@isar-build.org X-Gm-Message-State: AOJu0Yz+QiL4F8HgvReHexwyCOFruCfiybq5oMSljKltKme14hJI3yJ7 bau6hYNMafM7LSQQlQV7stGZsTAyH/wskqgdbamB7j0hErylKYhZYqlG X-Received: by 2002:a17:903:4b46:b0:2b2:45b7:306b with SMTP id d9443c01a7336-2b281917405mr264773495ad.25.1775727254533; Thu, 09 Apr 2026 02:34:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiL1J0oUtviw5XLz3MlFbGx4ohU4vPR1wn3eMBbRxWusoA==" Received: by 2002:a17:902:f642:b0:2b0:bccf:240c with SMTP id d9443c01a7336-2b275b31473ls82126895ad.0.-pod-prod-03-us; Thu, 09 Apr 2026 02:34:13 -0700 (PDT) X-Received: by 2002:a17:903:984:b0:2b0:5fbe:12ff with SMTP id d9443c01a7336-2b281918589mr253896225ad.30.1775727252925; Thu, 09 Apr 2026 02:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1775727252; cv=none; d=google.com; s=arc-20240605; b=JUOhovtBAD8fMnv3qH/GkbaimGxlYRtDP92kGOJBNd5PQkfwCbKj4EApp9+b3q4rAI xOCy4X+yx0ZmFBAbHnOv8R+DQZc0aGvj0TyLtTuDZYYrysrU7O2bwigRH7y40nQfEfZH Q2tYqxMVVh//g+7geyAujyW8zPA2I1Wk+ZX1IQJZ7kSX3r01Y6GC8LeZT6dvb9MoyFDQ wGPaNerIqmztqoi0kCF1QrcMP+X4wduQb8tBbykOVB1V0qeqgow6mJxEDBaE6AehlZ71 h0DY82OgE4d1NT0edlrknkunDedvibyuwx3sCNT/qSrlNDftuckittc2wjjVzuAj8SM5 w0WQ== 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=qBFQMZB2Hpk3TjT9AU7OmMaeGlWginTFi2mVahqsC+Y=; fh=F5B7sHw8QSYpzAgwBsAEFSY7gmjvHKn1s8Oqz1DQh58=; b=Sn1HgDqNBVamvXoitBTgORFqI/LOmEHsYGLTWwpV98NtYOIaU4oUUjxZgn3nD/rWO5 CkFgs6hZsJR3x6uduBLhICx45WoC1B6oXywtHqroAxSSR29RDxuCKJanrY7Drk8AfsRp t6aPozFCgtRBJ/Y1jQoCDpSat57+UAoQyFP0Y3x8rKIVLyYj2PEwdtsuPkistGOnCOnS R/zs866cP1I/Vv7KCAj5cfCZ4VzwlKHoPRdIR0KOb2/dtK6Ni6Np5IVCQpUsgdvyms29 cnYUsblnhcHylbFVK3iknd4zagHyJJB8nb9Lpy4j984utP/7y3yRT8pIfe0csXhXA1J8 vHMA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=MwO35uYL; spf=pass (google.com: domain of fm-1333022-20260409093410b12c3ddef50002071b-q__jog@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1333022-20260409093410b12c3ddef50002071b-q__Jog@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-2b2748f52b0si7860685ad.7.2026.04.09.02.34.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2026 02:34:12 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1333022-20260409093410b12c3ddef50002071b-q__jog@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20260409093410b12c3ddef50002071b for ; Thu, 09 Apr 2026 11:34:10 +0200 X-Patchwork-Original-From: "'Gourav Singh' via isar-users" From: "Singh, Gourav" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, Gourav Singh Subject: [PATCH v3] wic/plugins: gate root= with creator.rootdev for efi-isar and pcbios-isar Date: Thu, 9 Apr 2026 15:03:58 +0530 Message-Id: <20260409093358.3438728-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=MwO35uYL; spf=pass (google.com: domain of fm-1333022-20260409093410b12c3ddef50002071b-q__jog@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1333022-20260409093410b12c3ddef50002071b-q__Jog@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_H3,RCVD_IN_MSPIKE_WL, 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). 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..6c6698d6 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..5dd76761 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)