From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6664521766490079232 X-Received: by 2002:adf:e702:: with SMTP id c2mr948932wrm.31.1551704892283; Mon, 04 Mar 2019 05:08:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f350:: with SMTP id e16ls3436103wrp.13.gmail; Mon, 04 Mar 2019 05:08:11 -0800 (PST) X-Google-Smtp-Source: APXvYqxo25cUpYfXMBXfpFDLuA24mS1d2fjF50NDE503Dstc7966ZTGOshC7pMrH2ukaP2bv5LV5 X-Received: by 2002:adf:c748:: with SMTP id b8mr918881wrh.4.1551704891727; Mon, 04 Mar 2019 05:08:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551704891; cv=none; d=google.com; s=arc-20160816; b=ujmrpW0ZVHo9lweO7N64krfqygK6dOC7sTe80QXg3Vfs7urNnJ6QmJGsh8CqJ6QY+O 40xr528c5iKTx83qk3v1ZBrcLMhfFhb2XLjZ/C/vFHQpQzPGuKGKEYA1j7StkJAckbvA 5M6u00ZcvuGyZM+hpdxrTjKc5CK28S72Lb5ee+0NAjTlakQTfFVUjrxuQ9XAqGZ8phll m+oqFsiUNi2PhzSJiR/zT0MDYYc5EjFvAGMghf3F639eQHcDZfnWYKmVVZCtKXKAAURA OF7JW3m8M2ugM7pYDNo8CMv+dZwKZldxv8wdgkL4UQo/dlNPGZOD6l9L8/SF/VcNnR1b lgHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=sjx/6M8UH5S/fLHorArod+QU3fSG8i6HrXGqDLl3Odg=; b=PxsRSAwAMD/lVPtFzWgZK4S7WWtVd8n52eP4fMppn6pcyNXDvSWJk8jb5n1i43gHad KjNiwmBpUvuIQpy72UucxmWaQRZzLQpv1IzpOx4axwYmZoNWOxj7sdOQ8T1LSviwOjUR iGfExANVheizXuGg2mdpYlzY0PEW93qyzjTBnQ6jTllGExnCqqHiXidVUZShg3sH0tor Ix2GS4bezwSvuiN8un6CVuvdHmM4JpJDeP1HpOWme2DdvqAnLXEgxV39GA72teL3eDM2 XUrvgn4i/HR9ueTYMRVrUMvnAhFNOYSMHnEwiLF8X0KtEGpI1LT7Xr+UdU8FJI7g3bbI kuMw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id b8si308715wru.1.2019.03.04.05.08.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 05:08:11 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x24D8BHb006456 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Mar 2019 14:08:11 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x24D89Wv008505; Mon, 4 Mar 2019 14:08:11 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Harald Seiler Subject: [PATCH v4 6/6] Fix python style Date: Mon, 4 Mar 2019 14:08:01 +0100 Message-Id: <20190304130801.20628-7-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190304130801.20628-1-claudius.heine.ext@siemens.com> References: <20190304130801.20628-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: RW4sdVntkUDO From: Harald Seiler Signed-off-by: Harald Seiler --- .../recipes-kernel/example-module/example-module.bb | 8 +++++++- meta/classes/base.bbclass | 2 +- meta/classes/isar-events.bbclass | 1 - meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 9 ++++++--- .../recipes-core/isar-bootstrap/isar-bootstrap-target.bb | 5 +++-- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/meta-isar/recipes-kernel/example-module/example-module.bb b/meta-isar/recipes-kernel/example-module/example-module.bb index b725416..a08a6c5 100644 --- a/meta-isar/recipes-kernel/example-module/example-module.bb +++ b/meta-isar/recipes-kernel/example-module/example-module.bb @@ -11,7 +11,13 @@ # has hard dependencies from linux-compiler-gcc-4.8-arm, what # conflicts with the host binaries. python() { - if d.getVar('KERNEL_NAME') in ['armmp', 'arm64', 'rpi-rpfv', 'amd64', '686-pae']: + if d.getVar('KERNEL_NAME') in [ + 'armmp', + 'arm64', + 'rpi-rpfv', + 'amd64', + '686-pae', + ]: d.setVar('ISAR_CROSS_COMPILE', '0') } diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index c9b9e9e..9a1837f 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -126,7 +126,7 @@ python() { src_apt = [] for u in src_uri: if u.startswith(prefix): - src_apt.append(u[len(prefix):]) + src_apt.append(u[len(prefix) :]) else: new_src_uri.append(u) diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass index a178d05..7dd1ed5 100644 --- a/meta/classes/isar-events.bbclass +++ b/meta/classes/isar-events.bbclass @@ -8,7 +8,6 @@ addhandler isar_handler python isar_handler() { import subprocess - import bb.runqueue tmpdir = d.getVar('TMPDIR', True) if not tmpdir: diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb index a793585..08b068f 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb @@ -29,13 +29,16 @@ do_apt_config_prepare[vardeps] += "\ python do_apt_config_prepare() { if not os.path.islink(d.getVar("DEPLOY_ISAR_BOOTSTRAP", True)): apt_preferences_out = d.getVar("APTPREFS", True) - apt_preferences_list = (d.getVar("HOST_DISTRO_APT_PREFERENCES", True) or "" - ).split() + apt_preferences_list = ( + d.getVar("HOST_DISTRO_APT_PREFERENCES", True) or "" + ).split() aggregate_files(d, apt_preferences_list, apt_preferences_out) apt_sources_out = d.getVar("APTSRCS", True) apt_sources_init_out = d.getVar("APTSRCS_INIT", True) - apt_sources_list = (d.getVar("HOST_DISTRO_APT_SOURCES", True) or "").split() + apt_sources_list = ( + d.getVar("HOST_DISTRO_APT_SOURCES", True) or "" + ).split() aggregate_files(d, apt_sources_list, apt_sources_init_out) aggregate_aptsources_list(d, apt_sources_list, apt_sources_out) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb index bec6fa8..79f3e34 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb @@ -28,8 +28,9 @@ do_apt_config_prepare[vardeps] += "\ python do_apt_config_prepare() { if not os.path.islink(d.getVar("DEPLOY_ISAR_BOOTSTRAP", True)): apt_preferences_out = d.getVar("APTPREFS", True) - apt_preferences_list = (d.getVar("DISTRO_APT_PREFERENCES", True) or "" - ).split() + apt_preferences_list = ( + d.getVar("DISTRO_APT_PREFERENCES", True) or "" + ).split() aggregate_files(d, apt_preferences_list, apt_preferences_out) apt_sources_out = d.getVar("APTSRCS", True) -- 2.20.1