From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
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 [thread overview]
Message-ID: <20190514180300.27164-3-mosipov@ilbers.de> (raw)
In-Reply-To: <20190514180300.27164-1-mosipov@ilbers.de>
From: Claudius Heine <ch@denx.de>
This also sets the 'HOST_DISTRO' to 'DISTRO' per default. (jessie
support was dropped.)
Signed-off-by: Claudius Heine <ch@denx.de>
---
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
next prev parent reply other threads:[~2019-05-14 18:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-14 18:02 [PATCH v5 0/9] Cleanup rootfs creation Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 1/9] isar-bootstrap-host: disable DISTRO_BOOTSTRAP_KEYS usage Maxim Yu. Osipov
2019-05-14 18:02 ` Maxim Yu. Osipov [this message]
2019-05-14 18:02 ` [PATCH v5 3/9] move 'HOST_DISTRO_APT_SOURCES' from bootstrap-helper to isar-bootstrap Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 4/9] buildchroot.bbclass: only cross build if HOST_ARCH != DISTRO_ARCH Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 5/9] isar-bootstrap/buildchroot/sdkchroot: refactor PF and WORKDIR Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 6/9] bitbake.conf: remove unneeded and differently used variables Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 7/9] image.bbclass: make IMAGE_ROOTFS overwritable Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 8/9] bitbake.conf: set default QEMU_ARCH variables Maxim Yu. Osipov
2019-05-14 18:03 ` [PATCH v5 9/9] buildchroot/configscript: make creation of builder uid/gid idempotent Maxim Yu. Osipov
2019-05-15 6:43 ` [PATCH v5 0/9] Cleanup rootfs creation Claudius Heine
2019-05-15 6:55 ` Maxim Yu. Osipov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190514180300.27164-3-mosipov@ilbers.de \
--to=mosipov@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox