From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6620265736346533888 X-Received: by 2002:adf:fa82:: with SMTP id h2-v6mr1316721wrr.18.1541400735550; Sun, 04 Nov 2018 22:52:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5651:: with SMTP id j17-v6ls1353570wrw.28.gmail; Sun, 04 Nov 2018 22:52:15 -0800 (PST) X-Google-Smtp-Source: AJdET5dVf+z6eT5ZZ0R1P5ghmAOJNtfY9L+yqsVJ0Lk6EaXVQU+b2ceRfsUy842eV+nenLK+ax5t X-Received: by 2002:adf:e50f:: with SMTP id j15-v6mr567832wrm.5.1541400735067; Sun, 04 Nov 2018 22:52:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541400735; cv=none; d=google.com; s=arc-20160816; b=wTLo4/IIqxnjvY+4dWz+fltp4LwstKUBRjIRX0OHibORkvboxNNjmnFchtxkN4n+AN Qc6BVI4MjPZ7zhD0gadzdKCt3eXutbCZwQm79+1SSqjoWLhjKVop5aQ3uMSyc/Cb9L9K xVJV8hW73kBPGnqHPvZNEYZDT8a6IyaFCsPTYtJQBou20NTVesPxlsnvgxjKDQviHyHc fSlnuzDUUq500VueBVoHvYnFcxaiJ2s8xyfs8Wl/n965aY5W99h1qAfZDfHM3zolUCVW uQ6MhZQerQZ0Z5JXVp6rd0cU/zIawk0pt8SdixfRb7W/6QisKyTzz+QLxANbJgrSBsT8 9kQA== 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=QbbaLcH0ofO/tUJWlCnuM/q2VJWxrFIplKzAbs6T0Is=; b=WoGPQDYkXr9ipyRRZChBpoRdxqhSTIl65RUN2C6YWL0rYLS8Xjo/nybijrQfz4ESjP Ik6Ryln2iO/+XEa94t7axiNrI/68uinXU+coSJs8YZEWmCnuCBWhUiyTVBlwvAdmySnQ NhVvzEkoH0HjbYjBnhCd6KUWnYi9TN1ajJt1oBEagtov+0Qawze2IexH9oEXiRnjEir0 jCDCYFTZPu/+QktPlsxhFgTpxJ00iD4crYgwWENOzrQNhAsVgJTfzXRox6PUpwxYWnTf j9pMibDqWK1AeqjGHtD3ILSuJ2blp08R4fZDnxOVnD17BSzj4uECYVyJXjEB0PLFTDP5 4Y/w== 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 e5-v6si1135854wru.1.2018.11.04.22.52.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Nov 2018 22:52:15 -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 wA56qEjI028257 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 5 Nov 2018 07:52:14 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.39.16]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wA56qBn6011680 for ; Mon, 5 Nov 2018 07:52:14 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH 08/10] wic: bootimg-efi-isar: Avoid append "None" to kernel command line Date: Mon, 5 Nov 2018 07:52:08 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: MYYzPSFwPeh6 From: Jan Kiszka If there is nothing to append, bootloader.append will be None. Avoid that this is being stringified. Signed-off-by: Jan Kiszka --- meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 9ce694d..38f6fc0 100644 --- a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -75,7 +75,7 @@ class BootimgEFIPlugin(SourcePlugin): kernel = "/vmlinuz" grubefi_conf += "linux %s root=%s rootwait %s\n" \ - % (kernel, creator.rootdev, bootloader.append) + % (kernel, creator.rootdev, bootloader.append or "") initrd = "/initrd.img" @@ -152,7 +152,7 @@ class BootimgEFIPlugin(SourcePlugin): boot_conf += "title boot\n" boot_conf += "linux %s\n" % kernel boot_conf += "options LABEL=Boot root=%s %s\n" % \ - (creator.rootdev, bootloader.append) + (creator.rootdev, bootloader.append or "") if initrd: boot_conf += "initrd /%s\n" % initrd -- 2.16.4