From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6690944878080163840 X-Received: by 2002:a1c:6206:: with SMTP id w6mr16137790wmb.56.1557915118570; Wed, 15 May 2019 03:11:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8083:: with SMTP id 3ls482955wrl.9.gmail; Wed, 15 May 2019 03:11:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwYvRhu/oeRnZh4jaXlE1H2zrNZu5Zl3pLwLoodkc79eH8EqOnK82JlDXJsw230sblcaeJV X-Received: by 2002:adf:ce07:: with SMTP id p7mr10614719wrn.241.1557915118286; Wed, 15 May 2019 03:11:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557915118; cv=none; d=google.com; s=arc-20160816; b=iDch4LxhY1w7gC35oskdJiDVXEXlVzt89fQYMqr31SpPmtyOfaoSmSjUsz+G5H3URR Oi+MDjkTaz+sJ8IUFMrTyNvQUGODcnhcSUuzqhQekbrvlih7BtKGvR0T9J1pXtFD2m2l jwQPOFGGCl7Z2L7ye4Pb8vPjfpOVaMECrlT8wqDVdTRN0wj0inPjmzei8/1KkURzZaUT MRWLwtc7HqQ15ZvngQqDNHgp1RtiWGzl6SIb6EaHbYDsmdaVquijICwtomsqB+6CdlWK dFV4HZoMXbxZBxSbBZxnXdOltECucjmwGYe4wV5fyuRiO3Og12mOWlc1XCa2Y0qQBgqp rcHQ== 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=c7RkkMV/r8VwNBsDRfPXv4xojcJASx60mPLyQIgfQq0=; b=dU/YjlCCOQeDC9O/dPvrrTjSvVj9fahX9ar+9yiSojSE/qyQzDK1h0sbX80dZ4S+80 7MwvFdFXDVVkJCCWNBZPs/Wry9BuyM718XE0FLbLNQmfOEICFTquNfpDNWGJgtsMYi7P D1+flDZqHObU5NPuHGqAhwvkp5HnXtR1KKiMBBudVj8eFN/q7j2M7Slqe7VQSaQNfCWY Mp5SjUL+288IqGyqQSlHQu8QPYZhTNovaFMr1scLiSK6QNTcfXU0eNrjj3UW6sVz9sTK p4GaUkavzHXZFvjAAAcmP+Bbx6Xf517otkWjp0Nzqe3LmzrrhMN4A3GaRKwgkYVMxBv9 dLjg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id x18si133637wmh.2.2019.05.15.03.11.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2019 03:11:58 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x4FABvcs021318 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 May 2019 12:11:57 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x4FABv7L022198; Wed, 15 May 2019 12:11:57 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v6 2/9] isar-bootstrap-helper: move 'HOST_ARCH' and 'HOST_DISTRO' to base.bbclass Date: Wed, 15 May 2019 12:11:42 +0200 Message-Id: <20190515101149.22187-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190515101149.22187-1-claudius.heine.ext@siemens.com> References: <20190515101149.22187-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: jOWOXuAh3ks7 From: Claudius Heine This also sets the 'HOST_DISTRO' to 'DISTRO' per default. (jessie support was dropped.) Signed-off-by: Claudius Heine --- meta-isar/conf/multiconfig/rpi-stretch.conf | 1 + meta/classes/base.bbclass | 9 +++++++++ meta/classes/isar-bootstrap-helper.bbclass | 12 ------------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/meta-isar/conf/multiconfig/rpi-stretch.conf b/meta-isar/conf/multiconfig/rpi-stretch.conf index ec1f71d..f3fac38 100644 --- a/meta-isar/conf/multiconfig/rpi-stretch.conf +++ b/meta-isar/conf/multiconfig/rpi-stretch.conf @@ -12,6 +12,7 @@ MACHINE ?= "rpi" # This sets the default distribution configuration: DISTRO ?= "raspbian-stretch" DISTRO_ARCH ?= "armhf" +HOST_DISTRO ?= "debian-stretch" KERNEL_NAME ?= "rpi-rpfv" diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 9a1837f..ca80bf8 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -20,6 +20,15 @@ THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" +def get_deb_host_arch(): + import subprocess + host_arch = subprocess.check_output( + ["dpkg", "--print-architecture"] + ).decode('utf-8').strip() + return host_arch +HOST_ARCH ??= "${@get_deb_host_arch()}" +HOST_DISTRO ??= "${DISTRO}" + die() { bbfatal "$*" } diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass index 38d90fb..59c447b 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass +++ b/meta/classes/isar-bootstrap-helper.bbclass @@ -7,18 +7,6 @@ IMAGE_TRANSIENT_PACKAGES ??= "" -def get_deb_host_arch(): - import subprocess - host_arch = subprocess.check_output( - ["dpkg", "--print-architecture"] - ).decode('utf-8').strip() - return host_arch - -#Debian Distribution for SDK host -HOST_DISTRO ?= "debian-stretch" -#Determine SDK host architecture if not explicitly set -HOST_ARCH ?= "${@get_deb_host_arch()}" - HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" def reverse_bb_array(d, varname): -- 2.20.1