From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6643631842793619456 X-Received: by 2002:a2e:574f:: with SMTP id r15-v6mr3829295ljd.19.1546841078167; Sun, 06 Jan 2019 22:04:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:90ce:: with SMTP id o14-v6ls4893513ljg.11.gmail; Sun, 06 Jan 2019 22:04:37 -0800 (PST) X-Google-Smtp-Source: ALg8bN49detb57sCOt/tIJBkrwTh8fztoJ5C1zKrgUP92xiDJhMrM1B0yECfvpV+B4OtoQp7OgOr X-Received: by 2002:a2e:2bd3:: with SMTP id r80-v6mr3889711ljr.16.1546841077533; Sun, 06 Jan 2019 22:04:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546841077; cv=none; d=google.com; s=arc-20160816; b=hlcLSYPHjYu/Ssv+cWgm3dIyhwlEirQ5zXuVbBJmywU/OOHM+rlPIqFzUlJE6bGLsF 8E+M1iKW2MzOYCzzv+cu/8sbFsRARVLO5ktb4sZtUy0lFKlrfxoGIQIsNm8MtAGEIMzJ 2Swq/5KYykUQmSUvgO8LSRz9tikPreQDuTwK+xzAPAAORokdJw9fNq4ZaGif5J+LYiNl K7pMnxGqdxKw6eOVl+iptAzAMO75eXywJgetf2g7WEBnr5pB3fj4/E8TjAukeOzct+Mm v1WsXhLgRgZZRCJM0PiaS0wrksd7jIjRfQZA+Lt7u+yzmfK/Ua0JN4GIhbRlGjaOdfBt Wb5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:to; bh=1/ug6YpvfJWYe3sfm18U0Po54Neei8duCocswLx/9N4=; b=Pq7Jf4V5k+VK4uSHYSylXBd+SHCofvdZysz5eOwhsWnoVNL11RDcrZU1mufdfOBJAq Wfp2RP1wfmcwV5Q1imw8Vmwz/EMAfeqSQTYxsiz/0nedGgDZ4XTECSQpy7YgXntPPFdx dVp6pEcRsHFjHMz8EkIzJdqaXRVhAvQveFbS13nE/5fKEBoTGwOTbjaJw/V1gYAdGyMi YXnMtYUt2eb4FvWxybqFEHKrYFcjZ4WR36cLzbLmy1QAVS5MpLWqUYT/5GNuqCE407dW 7T8fIkSu5OScgkAtYnSQNzpqRBVn7k501uUdXwW0gVP33n/pvY77hhJAszP7osgdU+FY NDqg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id y27si2106602lfb.0.2019.01.06.22.04.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Jan 2019 22:04:37 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x0764avN005141 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 7 Jan 2019 07:04:36 +0100 Received: from [167.87.33.204] ([167.87.33.204]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0764ZCa021148 for ; Mon, 7 Jan 2019 07:04:36 +0100 To: isar-users From: Jan Kiszka Subject: [PATCH] rootfs-u-boot: Handle empty kernel command line appendix Message-ID: <07066619-0a05-67de-5e8c-728702acdbea@siemens.com> Date: Mon, 7 Jan 2019 07:04:35 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: wRPGD+Kj1b+j 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