From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6690944878080163840 X-Received: by 2002:a2e:9e9a:: with SMTP id f26mr19307607ljk.170.1557857004772; Tue, 14 May 2019 11:03:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:651a:: with SMTP id z26ls1865114ljb.1.gmail; Tue, 14 May 2019 11:03:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXVC7UaU2NO2pgfUOEmSlW5oOMzczgqPQbpGL9OnWlvYYcmzzmRZLqma8cX3OnqVbn1m3o X-Received: by 2002:a2e:9ec6:: with SMTP id h6mr15507124ljk.169.1557857004253; Tue, 14 May 2019 11:03:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557857004; cv=none; d=google.com; s=arc-20160816; b=ZywNuBiXeEB85FFFRZjAY0OctaOxwU6w09Icer8uD+clVuvqsomETnaCr0dtMNO4pa 7CdKHWRJjeh+AXPz0sgoEV0pzaEew7EsQ0DxqnZStWkLbJqXDc8K2+eznxXTGcXxLWXv xRKJK3rOTKQ4uIDu+2SvqblSbFbTQhnPISHv7EQaTq2WXIC6VCw8BGnQLYsnsc0g7OPP cW4YwZY11l6sgeFYj5kEkDuhRQepT7SOAl4UbSUGU2I71kfPPSJ7cUSL13OExtRmt/oj DVKAJuwkwN0+2kaqXZwt3ktdhFCMiJQ5+GcqdbyJQKG8kO5PLkS9o+vCrN8lvX5qKVJz 22IA== 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=aF9osTjixETmtc7u8sZr/nKtk7Jb3gsmou4GY622lIM=; b=Piwo/vSD99a9mmwO5iUK6vhi9z/OWaSOzOmfoksVyaIJdAdRMd9w6PfROWkUUWpHxZ Esa70/t44dkxcJLVIvLiqv4pv9O83vymjyBRkakaSYLZdZEEL8MT4ybpq8ziSYRHneQU subVkESp5olFv62kF/xjlp60Nc+ssDvsM9prEnDI9ffk15jmhDnRMpazs5gVRuJY9/ZK qbGLq8Dg/Xbsaigj9VRNqreq0pLiypZOH+cyhk3LTpq4UY4gEQOYUV+SQr8PBBDlvC1Y J/DnhEb9ChaO/vQyudC2vI7K0eS0D871ujWeSO+kTJM8FHtqli6JIiay1gZKEgX9OBY3 FaxA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id m25si3793320lfl.1.2019.05.14.11.03.24 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 11:03:24 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x4EI31w6001363 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 14 May 2019 20:03:23 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v5 2/9] isar-bootstrap-helper: move 'HOST_ARCH' and 'HOST_DISTRO' to base.bbclass Date: Tue, 14 May 2019 20:02:53 +0200 Message-Id: <20190514180300.27164-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190514180300.27164-1-mosipov@ilbers.de> References: <20190514180300.27164-1-mosipov@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 7WBrToJ61ArR 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.11.0