From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:a05:6000:100d:: with SMTP id a13mr456901wrx.2.1547616754881; Tue, 15 Jan 2019 21:32:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:aa94:: with SMTP id t142ls130339wme.2.gmail; Tue, 15 Jan 2019 21:32:34 -0800 (PST) X-Google-Smtp-Source: ALg8bN54YiYaB5Ffzrr8ELKMErP7Ye9prcCe2934/ZI3KGt3qLcMmJHW5Ap8j8qweBwjkcHwAxc4 X-Received: by 2002:a1c:9cc2:: with SMTP id f185mr569812wme.10.1547616754396; Tue, 15 Jan 2019 21:32:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547616754; cv=none; d=google.com; s=arc-20160816; b=T0GsVm/SnqC4Rg0g/LtecH/BaiyHgCzlV3VTWYFfKjNPdKQFMmirQxr68G7VB85dhz RgsJy/AvrYntYAbtAxg/iYAVJJSQQd+bKTzaedUrGhu0r54QQ74Pdjfh5YObRDCiGQQy Ba+SJHiNojsmSqJ0N88wKhNl5jU6FHgaLcjXljH/Gmnms69XfcbY+T53LfXBHNVsGVRP 1Ce2wppNU02TxQJvdB9OCu9gLUr6C3UX+/jJKIuPSUPVEn+n8duGnlYu+r1zn3ngi8WD /H+j4Li5HHFiMhs3JTzzf6FcrhfpsTDIKhZSlCQQag6GfAfg1T+hnBEqr5/7QUTsKwI3 2H2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=1/ug6YpvfJWYe3sfm18U0Po54Neei8duCocswLx/9N4=; b=It27zuc+8pankZYa0lgzeyqcZZYSwG5hw7mvEQxwHM/VVSmzltgFJocmNBctDW8Epu 6rZN7DE1lDoDbEfAtBYL22nlrXS6TzWgI7fk7oIhO0q40vTlKA7XwqXLTakbMv/w/l31 FD2l/mmeWILsCsXbnoIsPzanivZkuD6paZ9OUxml7611McjsSulRvVj61Ulx2VZPrI+I 2QLgzN7q5Xc/cpoi1ZyaKScVYH7jeDAsTLhxtm8Egsq6gz8BXyWbwFxoPynFq/u89Sd6 74d/cODadWNf90SHa6EpVL8afZvG4bJidtQUE5QCRgPL3xrEiGgqT1xIcJ24M0M+c/Mg fzGQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id x188si814855wmb.3.2019.01.15.21.32.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 21:32:34 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x0G5WXJX019035 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Jan 2019 06:32:33 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.33.125]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0G5WRoT011496 for ; Wed, 16 Jan 2019 06:32:33 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v3 11/14] rootfs-u-boot: Handle empty kernel command line appendix Date: Wed, 16 Jan 2019 06:32:24 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 9ktAZoNB4p+L From: Jan Kiszka Avoids appending "None" of no extra command line options are given. Signed-off-by: Jan Kiszka --- 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