From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH] rootfs-u-boot: Handle empty kernel command line appendix
Date: Mon, 7 Jan 2019 07:04:35 +0100 [thread overview]
Message-ID: <07066619-0a05-67de-5e8c-728702acdbea@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
Avoids appending "None" of no extra command line options are given.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py | 2 +-
1 file changed, 1 insertion(+), 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 37baea9..f60afb8 100644
--- a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py
+++ b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py
@@ -69,7 +69,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))
+ (cr.rootdev, 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 ''
--
2.16.4
reply other threads:[~2019-01-07 6:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=07066619-0a05-67de-5e8c-728702acdbea@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox