From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657041487194226688 X-Received: by 2002:a7b:ce1a:: with SMTP id m26mr358919wmc.16.1549990634999; Tue, 12 Feb 2019 08:57:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2d17:: with SMTP id t23ls469110wmt.14.gmail; Tue, 12 Feb 2019 08:57:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IY4YZRUav60R0/GKN3AuiqyCxVFqFKq4OAUYQyIoxgKAnwJ/v6uOj39IzeXvrBX7LlnKmm1 X-Received: by 2002:a7b:c349:: with SMTP id l9mr375429wmj.18.1549990634617; Tue, 12 Feb 2019 08:57:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549990634; cv=none; d=google.com; s=arc-20160816; b=sKfcEF/jIQA2hne1FMAiLl9xcE1zx9WO05rfNhytakNRGq6OEft+cP6JE+xsLtpv+R VgVT++AkXdxj8i3RbSjlVU4i3gJv4985FCUUOofdBCdBylPC3swPlkhKDvW+XFsofXAA bjy2S7LDSH+4hBxr0P+eRlBHKLd9u8rdVP3glP1FiglqYOEvLlVaNmAbgDmaSURHn/nY tFDIi9b+2tt3YhCQkuHqwA/H4KrY38YaLS6A4p3++3pUOW6FiUn/Rpki7ao6ELGrauQj HhxMkWPLgYYzj+G4Pm2qT+4akISOpPwzYnrTf2/fzO70ZjEMOeWa3IE9gRf6Jvq+6D1O X4xA== 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:to:from; bh=DCW0AdXXd6KU/4J/edSKu4iyyqnzloIH1ZJ+2xlMlCU=; b=synn52CXWTJs9kfje4Yu8L0T3gtxx/3SdbyY+TKumJiKOGPvO6CiBEX+3JcoyUWwJk acD0PwfzYIVnk1a7zx0lyqxlQIEjh5al6+2I5z4Y0OVgSFp3COSz8jdooQt4oP0qL+3C UmGs2Z2ps71aCEmZFgOTmv5+ob6xlnwpjsEQLvIMBy9DxGhBb75gXHMH8gShgC/VkEXZ 71n8fuwH6e2HapKjwgt7XmZ2/mTHc2OiNIsTCmhbQJMqsDfNaO5V2Ub1lZrBbowCSKpr /mOrIIJh141QfBRwJmAwX77EtvX5dE9+lOB94+6T0CtVumAWtnHBoFbXgfpvdIXuHGoA pi4w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) smtp.mailfrom=hws@denx.de Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.9]) by gmr-mx.google.com with ESMTPS id q5si575730wrn.0.2019.02.12.08.57.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 08:57:14 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) client-ip=212.18.0.9; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) smtp.mailfrom=hws@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43zTNB3C03z1rV0J for ; Tue, 12 Feb 2019 17:57:14 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43zTNB35zNz1r2Gy for ; Tue, 12 Feb 2019 17:57:14 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 3_v__TDjRh4n for ; Tue, 12 Feb 2019 17:57:13 +0100 (CET) X-Auth-Info: slIVvje/H/suVYskslEusjL6Qo8NYT894+bK46IUXWs= Received: from sandvich.fritz.box (p578a821c.dip0.t-ipconnect.de [87.138.130.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Tue, 12 Feb 2019 17:57:13 +0100 (CET) From: Harald Seiler To: isar-users@googlegroups.com Subject: [PATCH v2 5/5] Fix python style Date: Tue, 12 Feb 2019 17:56:37 +0100 Message-Id: <20190212165637.19970-6-hws@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190212165637.19970-1-hws@denx.de> References: <20190212165637.19970-1-hws@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: qgjFj0fuSWwm Signed-off-by: Harald Seiler --- meta-isar/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 ++++++--- meta/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 4dea51b..eebcfe3 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -125,7 +125,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.14.1