From patchwork Tue Aug 3 03:06:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 638 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 09 Aug 2021 17:09:35 +0200 X-Sieve: CMU Sieve 2.4 Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 179F9Xgb019490 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 9 Aug 2021 17:09:34 +0200 Resent-From: Baurzhan Ismagulov Resent-Date: Mon, 9 Aug 2021 17:09:33 +0200 Resent-Message-ID: <20210809150933.GE28547@yssyq.m.ilbers.de> Resent-To: patchwork@isar-build.org Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Tue, 03 Aug 2021 13:06:16 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 173B6G4X026184 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 3 Aug 2021 13:06:16 +0200 Received: by mail-lf1-f58.google.com with SMTP id p16-20020a0565122350b029030e2ef98a19sf7827329lfu.22 for ; Tue, 03 Aug 2021 04:06:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627988770; cv=pass; d=google.com; s=arc-20160816; b=WSKKVkZxK2b9ncIHxOcZux3gkNmVMBNOGMJT3Ro3CBVqsTq6gdGj/2RmxkkwaApERy Rl1LqsAkH+L50+ksswC+/jUecrUhLrRZz2PX3E8jLJLRqwDIQAaszCLZXW87hVSFRQQk 6l8Mqn+XMTKJ7DzmwPA97WmlNWthCrRsqB28jdXEEFajfpOGbTNuuQaGM0q18AdL3lEG lyGfzTvuOC0//6kVGco6I4MuqwpqvlV8ml/9961I72xc9H9cCBtFH9ShdmbBOsa5/wBK k10y+YZOQLXZEEBYACtptj89fbYoPg04kNuazTUXDhW7mhVP7fs1DnxWxxpqgkU6gay1 wQnQ== 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:sender:dkim-signature; bh=OuEjGudsx9zECX4is/X3DF1WXHIErC3QW5tl8BTHx5s=; b=gP13+mX9YMAD2+RAgDB3MD8dED54rd9WRSFs82GNdWkybmg4ep2fMQwFhlp2ZFPXQl gbKuoTf33z97Xl9n3c6d+n234lSVxWq8t4Tkn+E6XdW5ffoK8N5diUbSKgaZCqfRLuf/ V0FuruBNOAs5IP36Y1QbO6vS7bHRRplpxzlPo2hBFXABWEnBUASZpzNrbCGcGxJ/s6EV cL8+QDrzYYKvPRWf2yGXLQsLOF60QlkzH2q++JWVhTwhyjQ2apxc+tG15/iXJa0E0CVu MWoOxitQpn+QFVMoxt1MQmh4vawRKnsDFkoGWrIt2YziQprdWHsWkJqrOAQnRYHcTDzP SAGA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender: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=OuEjGudsx9zECX4is/X3DF1WXHIErC3QW5tl8BTHx5s=; b=qPbuCRdKfarQ158ZG3rATe5qzT1RinAY7uE6iSXGts7DwjSBgRdXM7thjRNWXrP4rm 7QyNfcevX6g5hnQxxR/YaOF7ka1zpzq4GaC1ZFiusZscJdVS0L3QOzxug1Q2sBqXzlGP GhVsTHZnPA4Km/LnFPaK2Of1K36kxBQ7EMYVnIyDhaYTcbN/WNsxgm/LzM74reaNDiUq Jl2VITAUJIQBRlRMK2ofvafM+cD/CmEyCXtUoIikVM5dXpt8A85uuUbVfG+61GDcVbHo UvOKbX6do94EsrllQhF5KjzLTs329L3PHIWQmwasoLQGdawLw0uUSuSjoI7PsHQxRI+8 NyFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state: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=OuEjGudsx9zECX4is/X3DF1WXHIErC3QW5tl8BTHx5s=; b=BJFnqYuISIga2utnfy5EA0R/SRvYqPzShV37Qx/W4LXDEJgBdlk/l0V2wBEHgiECZN RjPHiH6PFuLKi+/k2owWIag/fDrxXwV5eJVU3rxKUlhd6FnijvkNHDU2zgFgE4tvQx1n sVUroUKLGz2s+GkJV7FFzbJUV731SZIXMfyJMFPu17dCBlm/QfApISgTnDpMOTDLUjqe UGuBpRSY7CTaiqQY67ngXJBOBG2MlsHQ/3hltfp3z0F838W0En4zghuetl4kGZ+ZmW/d YrEkw2TQIHBtrsgLSKwY5buSGr3TrtDOV+sXmy+vZh/NtVamSaIS9qNAEfsOXGMcp/Mm u2CA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532nR0v66HPHrqH335tHu2eubWlF/znF0ymEKUCJG2G5qFXFYUzd maYx8gnAffHZMTXqHXTgX1w= X-Google-Smtp-Source: ABdhPJzBSnQXM0MI8MXKK7N6LRnoPtBXeb4281MJnAFDUG5ZJREV2xuIbAdZpRbWi2rkKkh5M/XRNw== X-Received: by 2002:a2e:a288:: with SMTP id k8mr13766242lja.107.1627988770688; Tue, 03 Aug 2021 04:06:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b171:: with SMTP id a17ls2043776ljm.4.gmail; Tue, 03 Aug 2021 04:06:09 -0700 (PDT) X-Received: by 2002:a2e:a793:: with SMTP id c19mr14345739ljf.426.1627988769616; Tue, 03 Aug 2021 04:06:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627988769; cv=none; d=google.com; s=arc-20160816; b=RNItiiqos4eMgXjcf/93O1cGGErnwg3iu+KTmVtu6EofH2HoH2L5LLfpDVN6ZO6NFy O7khnHrAXxivtxHvAjUKejOsp7IOh6b6a7zzSNOXM0zjaDlIQh0lQMvGgqAmu9Mn3RMT 0b+4nZVICR1OZdd5b/egoR0wTQ83aTvKW0/93apBmFDDxpEaHaBUXPSCK+Y33f/OR/U6 8mxqB8wCjujqbYqSKe0mPxpRFD5gZPpggaRoyTzvJ/WOJo9R/KmZZn1JHEUR3w5Yf32L 2agqEvGEaxyyuLC2mJUExTXWTYQPNWzBBiO0nkxwRWGRarJsUC1hzmq82+MohWsPJeAL sYUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=3ww5UldXFFR60F9cuaytw1vczXfU5rnK20AhvUjmUt0=; b=y8Nv0+8n+c2tLDNGDu6eTwQLUY0GldmZNF8UFy2j4YEfMx86QdP1b0CAiWGG5X1IW0 ctVV5vc4SLNLOMOTsFd55DVlURmCmr3PKsgB0ZB9yg+xN5bhrxuo/xPNaGIoLmz0nArI CLPFGzeLK9lBUqu52TCbhisigJIauvU+PSttM3IAfWSoFw6qV9IfgoAtzI4uMaiVfu3r x8tZsUPdMtIYzrWn2qMfQC3EJHaqEZaeMoh++YmzRV3iGKFA3ecVC5XaADcCxO04n7Ae pzzLPpmH5v7YRtlqJ4YXnYa+Fx6289jjWe15vlspxGPxHjvF8PgBhIqh/ZZnji7F9cnp Minw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id v15si673098lfa.6.2021.08.03.04.06.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Aug 2021 04:06:09 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 173B68EW021635 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 3 Aug 2021 13:06:08 +0200 Received: from md2dvrtc.fritz.box ([167.87.79.224]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 173B68Ys019242; Tue, 3 Aug 2021 13:06:08 +0200 From: "Q. Gylstorff" To: isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH v2] wic/rootfs-u-boot: Allow to set root with source_params Date: Tue, 3 Aug 2021 13:06:08 +0200 Message-Id: <20210803110608.29342-1-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Original-Sender: quirin.gylstorff@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.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-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,UNPARSEABLE_RELAY 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: INBOX From: Quirin Gylstorff If the root device needs to be modified during boot it needs to be set as source parameter in the wic file similar to efi boot. Signed-off-by: Quirin Gylstorff --- Changes V2: - remove autoformatted code meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py index 15acb57..0b4f9ee 100644 --- a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py +++ b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py @@ -60,6 +60,13 @@ class RootfsUBootPlugin(RootfsPlugin): (rootfs_dir, image_rootfs_dir)) real_rootfs_dir = image_rootfs_dir + root_dev = cr.rootdev + if not root_dev: + root_dev = source_params.get("root", None) + if not root_dev: + raise WicError("root not defined, exiting.") + root_dev = root_dev.replace(":", "=") + u_boot_script = os.path.join(real_rootfs_dir, "etc/default/u-boot-script") if not os.path.exists(u_boot_script): @@ -70,7 +77,7 @@ class RootfsUBootPlugin(RootfsPlugin): cfg.write('# Generated by wic, rootfs-u-boot plugin\n') cfg.write('ROOT_PARTITION="%d"\n' % part.realnum) cfg.write('KERNEL_ARGS="root=%s %s"\n' % \ - (cr.rootdev, cr.ks.bootloader.append or "")) + (root_dev, cr.ks.bootloader.append or "")) no_initrd = source_params.get('no_initrd') or '' cfg.write('NO_INITRD="%s"\n' % no_initrd) overlays = source_params.get('overlays') or ''