From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6680483261914808320 X-Received: by 2002:aa7:d311:: with SMTP id p17mr23479420edq.55.1556199945060; Thu, 25 Apr 2019 06:45:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:f75a:: with SMTP id jp26ls653202ejb.12.gmail; Thu, 25 Apr 2019 06:45:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqyEwuRvkwaf1x9byEeXYACgABgw8sEAOfJfqsFFFZ50ZtiqlCiPMuyX54AKRArBrjtbPZEv X-Received: by 2002:a17:906:12c1:: with SMTP id l1mr19762541ejb.284.1556199944670; Thu, 25 Apr 2019 06:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556199944; cv=none; d=google.com; s=arc-20160816; b=W/qLM9BrNSgg9Pu7fLQtkd8mTngEQPHrZPv1Wn6H+Lsv6rbCdadKcvhz6jFVX/5BQz V429bRlQIPrIWdlyHy6TP98IddT+gljY+br4YyAYpAURVyWuaF2N5hq5AiaV3MtYhxZB e1R/stSGLBLcFgK+77SuKB7vnuf6b0OEQKWajVZsj52ZjGqFSGKqk/23fSLieWDiR+SN CDbjF+99hGmhtcyLEJ75vxdvhTiET0Q7sEMmcms3yNZp2Q0nrBxfXNzKrSICA24XRXvD FwTNfnorPeHcRBHE7KnHDGWeWBBfhHPKDHquMf1YxRkNrdNWboA4Hb9AKNeNpO8qlp+O MriA== 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=R0nzvd8aVbo+mwhomc/812Hbg8X/SoFZR4n85PeQNrEhvOLviw+d6xNROqUKLLXY/z nJi63YqnZIil+2+StTFLRw5+bXsmTwpKyk52Ec7Eub3CJYcqrDRBGtXxlnOI+aCL9QaX FUeclEULgkYhsQ0NGkfMeEbIjAWWh3rP+Yn6D6LQ7pGAAEwZ+LCc8aHk7eYC4oAZ8NWR NmA9BfFcHAHoJgAUu+mtzeqr6yQLgG4AhtNeN4u0vuGehAyzNylbj45pSdY4+sLSRkZY IbXzuqTKCERBixG3vRCGWt3+zFkaxgMFRc0LXMD9b0xOU1XLZIUxVfHaP5SVJTIn+nsF 5HYw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id x49si490339edb.0.2019.04.25.06.45.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 06:45:44 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x3PDjh8K024051 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Apr 2019 15:45:43 +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 x3PDjhOJ017181; Thu, 25 Apr 2019 15:45:43 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v4 2/9] isar-bootstrap-helper: move 'HOST_ARCH' and 'HOST_DISTRO' to base.bbclass Date: Thu, 25 Apr 2019 15:44:43 +0200 Message-Id: <20190425134450.13443-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425134450.13443-1-claudius.heine.ext@siemens.com> References: <20190425134450.13443-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: e8TKOZJsTBkp 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