* [PATCH v5 1/9] isar-bootstrap-host: disable DISTRO_BOOTSTRAP_KEYS usage
2019-05-14 18:02 [PATCH v5 0/9] Cleanup rootfs creation Maxim Yu. Osipov
@ 2019-05-14 18:02 ` Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 2/9] isar-bootstrap-helper: move 'HOST_ARCH' and 'HOST_DISTRO' to base.bbclass Maxim Yu. Osipov
` (8 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-14 18:02 UTC (permalink / raw)
To: isar-users
From: Claudius Heine <ch@denx.de>
isar-bootstrap-host only supports bootstrapping Debian root file
systems. Therefore deactivate any DISTRO_BOOTSTRAP_KEYS from other
distributions.
Signed-off-by: Claudius Heine <ch@denx.de>
[Maxim: rebased]
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
index 7ee4c61..5501e35 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
@@ -12,6 +12,8 @@ DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}"
ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}.lock"
require isar-bootstrap.inc
+# We only build debian host buildchroot environments
+DISTRO_BOOTSTRAP_KEYS = ""
inherit isar-bootstrap-helper
do_generate_keyrings[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v5 2/9] isar-bootstrap-helper: move 'HOST_ARCH' and 'HOST_DISTRO' to base.bbclass
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
2019-05-14 18:02 ` [PATCH v5 3/9] move 'HOST_DISTRO_APT_SOURCES' from bootstrap-helper to isar-bootstrap Maxim Yu. Osipov
` (7 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-14 18:02 UTC (permalink / raw)
To: isar-users
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
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v5 3/9] move 'HOST_DISTRO_APT_SOURCES' from bootstrap-helper to isar-bootstrap
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 ` [PATCH v5 2/9] isar-bootstrap-helper: move 'HOST_ARCH' and 'HOST_DISTRO' to base.bbclass Maxim Yu. Osipov
@ 2019-05-14 18:02 ` 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
` (6 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-14 18:02 UTC (permalink / raw)
To: isar-users
From: Claudius Heine <ch@denx.de>
This variable is only used in 'isar-bootstrap-host.bb' and mentioned in
'isar-bootstrap.inc'. So it does not make sense to have it available
anywhere else.
Signed-off-by: Claudius Heine <ch@denx.de>
[Maxim: rebased]
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
meta/classes/isar-bootstrap-helper.bbclass | 2 --
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass
index 59c447b..0d77929 100644
--- a/meta/classes/isar-bootstrap-helper.bbclass
+++ b/meta/classes/isar-bootstrap-helper.bbclass
@@ -7,8 +7,6 @@
IMAGE_TRANSIENT_PACKAGES ??= ""
-HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list"
-
def reverse_bb_array(d, varname):
array = d.getVar(varname, True)
if array is None:
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 09aed83..b740c57 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -28,6 +28,7 @@ DEPLOY_ISAR_BOOTSTRAP ?= ""
DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales"
DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg2"
DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = ",apt-transport-https,ca-certificates"
+HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list"
DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org file:///${REPO_BASE_DIR} \n" if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) else "" }"
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v5 4/9] buildchroot.bbclass: only cross build if HOST_ARCH != DISTRO_ARCH
2019-05-14 18:02 [PATCH v5 0/9] Cleanup rootfs creation Maxim Yu. Osipov
` (2 preceding siblings ...)
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 ` Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 5/9] isar-bootstrap/buildchroot/sdkchroot: refactor PF and WORKDIR Maxim Yu. Osipov
` (5 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-14 18:02 UTC (permalink / raw)
To: isar-users
From: Claudius Heine <ch@denx.de>
Signed-off-by: Claudius Heine <ch@denx.de>
---
meta/classes/buildchroot.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass
index 1a87bf4..ea1538a 100644
--- a/meta/classes/buildchroot.bbclass
+++ b/meta/classes/buildchroot.bbclass
@@ -8,7 +8,7 @@ ISAR_CROSS_COMPILE ??= "0"
# Add dependency from the correct buildchroot: host or target
python __anonymous() {
mode = d.getVar('ISAR_CROSS_COMPILE', True)
- if mode == "0":
+ if mode == "0" or d.getVar('HOST_ARCH') == d.getVar('DISTRO_ARCH'):
dep = "buildchroot-target:do_build"
rootfs = d.getVar('BUILDCHROOT_TARGET_DIR', True)
else:
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v5 5/9] isar-bootstrap/buildchroot/sdkchroot: refactor PF and WORKDIR
2019-05-14 18:02 [PATCH v5 0/9] Cleanup rootfs creation Maxim Yu. Osipov
` (3 preceding siblings ...)
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 ` Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 6/9] bitbake.conf: remove unneeded and differently used variables Maxim Yu. Osipov
` (4 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-14 18:02 UTC (permalink / raw)
To: isar-users
From: Claudius Heine <ch@denx.de>
Each of those are dependent on both HOST_ARCH and DISTRO_ARCH, so the
stamps etc. should not be shared.
Signed-off-by: Claudius Heine <ch@denx.de>
[Maxim: rebased]
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
meta/classes/image-sdk-extension.bbclass | 2 +-
meta/classes/isar-bootstrap-helper.bbclass | 4 ++--
meta/conf/bitbake.conf | 4 ++--
meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 11 +++--------
meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb | 6 +-----
meta/recipes-devtools/buildchroot/buildchroot-host.bb | 3 ++-
meta/recipes-devtools/buildchroot/buildchroot.inc | 3 +--
meta/recipes-devtools/sdkchroot/sdkchroot.bb | 5 ++---
8 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass
index 1838080..8df3ed1 100644
--- a/meta/classes/image-sdk-extension.bbclass
+++ b/meta/classes/image-sdk-extension.bbclass
@@ -5,7 +5,7 @@
#
# This class extends the image.bbclass to supply the creation of a sdk
-SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO}-${HOST_ARCH}"
+SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}"
do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}"
do_populate_sdk[depends] = "sdkchroot:do_build"
diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass
index 0d77929..8612be2 100644
--- a/meta/classes/isar-bootstrap-helper.bbclass
+++ b/meta/classes/isar-bootstrap-helper.bbclass
@@ -52,8 +52,8 @@ setup_root_file_system() {
--clean) CLEAN=1 ;;
--copyisarapt) COPYISARAPT=1 ;;
--fstab) FSTAB=$2; shift ;;
- --host-arch) ROOTFS_ARCH=${HOST_ARCH} ;;
- --host-distro) ROOTFS_DISTRO=${HOST_DISTRO} ;;
+ --host-arch) ROOTFS_ARCH="$2-$ROOTFS_ARCH"; shift ;;
+ --host-distro) ROOTFS_DISTRO="$2"; shift ;;
--keep-apt-cache) KEEP_APT_CACHE=1 ;;
-*) bbfatal "$0: invalid option specified: $1" ;;
*) break ;;
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3a79df3..6bd644b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -51,8 +51,8 @@ DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap"
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
DL_DIR ?= "${TOPDIR}/downloads"
SSTATE_DIR ?= "${TMPDIR}/sstate-cache"
-BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host/rootfs"
-BUILDCHROOT_TARGET_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target/rootfs"
+BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}/rootfs"
+BUILDCHROOT_TARGET_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target-${DISTRO}-${DISTRO_ARCH}/rootfs"
CACHE = "${TMPDIR}/cache"
OVERRIDES = "${DISTRO_ARCH}:${MACHINE}:${DISTRO}:forcevariable"
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
index 5501e35..ee8f362 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb
@@ -6,19 +6,15 @@
# SPDX-License-Identifier: MIT
Description = "Minimal host Debian root file system"
+PF = "${PN}-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}"
-WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${HOST_DISTRO}-${HOST_ARCH}"
-DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}"
-ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}.lock"
+DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}"
+ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}.lock"
require isar-bootstrap.inc
# We only build debian host buildchroot environments
DISTRO_BOOTSTRAP_KEYS = ""
-inherit isar-bootstrap-helper
-do_generate_keyrings[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
-
-do_apt_config_prepare[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
do_apt_config_prepare[dirs] = "${WORKDIR}"
do_apt_config_prepare[vardeps] += "\
APTPREFS \
@@ -49,7 +45,6 @@ addtask apt_config_prepare before do_bootstrap after do_unpack
OVERRIDES_append = ":${@get_distro_needs_https_support(d, True)}"
-do_bootstrap[stamp-extra-info] = "${HOST_DISTRO}-${HOST_ARCH}"
do_bootstrap[vardeps] += "HOST_DISTRO_APT_SOURCES"
do_bootstrap() {
isar_bootstrap --host
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb
index 39f12b5..77276e9 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb
@@ -6,16 +6,13 @@
# SPDX-License-Identifier: MIT
Description = "Minimal target Debian root file system"
+PF = "${PN}-${DISTRO}-${DISTRO_ARCH}"
-WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}"
ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}.lock"
require isar-bootstrap.inc
-do_generate_keyrings[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
-
-do_apt_config_prepare[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
do_apt_config_prepare[dirs] = "${WORKDIR}"
do_apt_config_prepare[vardeps] += "\
APTPREFS \
@@ -44,7 +41,6 @@ addtask apt_config_prepare before do_bootstrap after do_unpack
OVERRIDES_append = ":${@get_distro_needs_https_support(d, False)}"
-do_bootstrap[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
do_bootstrap[vardeps] += "DISTRO_APT_SOURCES"
do_bootstrap() {
isar_bootstrap
diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb
index c8c10c0..73cd548 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot-host.bb
@@ -4,6 +4,7 @@
# Copyright (C) 2015-2018 ilbers GmbH
DESCRIPTION = "Isar development filesystem for host"
+PF = "${PN}-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}"
require buildchroot.inc
@@ -27,5 +28,5 @@ BUILDCHROOT_PREINSTALL_append_arm64 += "binutils-aarch64-linux-gnu \
crossbuild-essential-arm64"
-PARAMS = "--host-arch --host-distro"
+PARAMS = "--host-arch '${HOST_ARCH}' --host-distro '${HOST_DISTRO}'"
do_build[depends] = "isar-apt:do_cache_config isar-bootstrap-host:do_bootstrap"
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc
index 764bc5e..cdb4c07 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.inc
+++ b/meta/recipes-devtools/buildchroot/buildchroot.inc
@@ -12,13 +12,12 @@ SRC_URI = "file://configscript.sh \
file://common.sh \
file://deps.sh"
PV = "1.0"
+PF = "${PN}-${DISTRO}-${DISTRO_ARCH}"
inherit isar-bootstrap-helper
-WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
BUILDCHROOT_DIR = "${WORKDIR}/rootfs"
-do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
do_build[root_cleandirs] = "${BUILDCHROOT_DIR} \
${BUILDCHROOT_DIR}/isar-apt \
${BUILDCHROOT_DIR}/downloads \
diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb
index 895a454..49aeb47 100644
--- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb
+++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb
@@ -14,6 +14,7 @@ SRC_URI = " \
PV = "0.1"
inherit isar-bootstrap-helper
+PF = "${PN}-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}"
SDKCHROOT_PREINSTALL := "debhelper \
autotools-dev \
@@ -25,11 +26,9 @@ SDKCHROOT_PREINSTALL := "debhelper \
devscripts \
equivs"
-WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${HOST_DISTRO}-${HOST_ARCH}"
S = "${WORKDIR}/rootfs"
do_build[dirs] = "${DEPLOY_DIR_IMAGE}"
-do_build[stamp-extra-info] = "${HOST_DISTRO}-${HOST_ARCH}"
do_build[root_cleandirs] = "${S} \
${S}/isar-apt"
@@ -50,7 +49,7 @@ do_build() {
packages="${SDKCHROOT_PREINSTALL} crossbuild-essential-${DISTRO_ARCH}"
fi
- setup_root_file_system --copyisarapt --host-arch --host-distro "${S}" $packages
+ setup_root_file_system --copyisarapt --host-arch '${HOST_ARCH}' --host-distro '${HOST_DISTRO}' "${S}" $packages
# Configure root filesystem
sudo install -m 644 ${WORKDIR}/README.sdk ${S}
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v5 6/9] bitbake.conf: remove unneeded and differently used variables
2019-05-14 18:02 [PATCH v5 0/9] Cleanup rootfs creation Maxim Yu. Osipov
` (4 preceding siblings ...)
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 ` Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 7/9] image.bbclass: make IMAGE_ROOTFS overwritable Maxim Yu. Osipov
` (3 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-14 18:02 UTC (permalink / raw)
To: isar-users
From: Claudius Heine <ch@denx.de>
IMAGE_CMD and TARGET_ARCH are not used in Isar or any bitbake code.
IMAGE_ROOTFS is used as the directory where image recipes store their
root file system. Pointing that to a global path like '${TMPDIR}/rootfs'
does not make sense for Isar.
Signed-off-by: Claudius Heine <ch@denx.de>
---
meta/conf/bitbake.conf | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6bd644b..5edc5f1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -26,8 +26,6 @@ DEPLOY_DIR = "${TMPDIR}/deploy"
FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}"
GITDIR = "${DL_DIR}/git"
-IMAGE_CMD = "_NO_DEFINED_IMAGE_TYPES_"
-IMAGE_ROOTFS = "${TMPDIR}/rootfs"
P = "${PN}-${PV}"
PF = "${PN}-${PV}-${PR}"
PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}"
@@ -40,7 +38,6 @@ SRC_URI = "file://${FILE}"
STAMP = "${TMPDIR}/stamps/${PF}"
SVNDIR = "${DL_DIR}/svn"
T = "${WORKDIR}/temp"
-TARGET_ARCH = "${BUILD_ARCH}"
TMPDIR = "${TOPDIR}/tmp"
PERSISTENT_DIR = "${TMPDIR}/cache"
GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}"
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v5 7/9] image.bbclass: make IMAGE_ROOTFS overwritable
2019-05-14 18:02 [PATCH v5 0/9] Cleanup rootfs creation Maxim Yu. Osipov
` (5 preceding siblings ...)
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 ` Maxim Yu. Osipov
2019-05-14 18:02 ` [PATCH v5 8/9] bitbake.conf: set default QEMU_ARCH variables Maxim Yu. Osipov
` (2 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-14 18:02 UTC (permalink / raw)
To: isar-users
From: Claudius Heine <ch@denx.de>
This way recipes that inherit image.bbclass can set this path
themselves. This was previously not possible, because the bitbake.conf
set this variable with '='.
Signed-off-by: Claudius Heine <ch@denx.de>
---
meta/classes/image.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8e6f2c9..93d9bfc 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -5,7 +5,7 @@ PF = "${PN}-${DISTRO}-${MACHINE}"
IMAGE_INSTALL ?= ""
IMAGE_TYPE ?= "ext4-img"
-IMAGE_ROOTFS = "${WORKDIR}/rootfs"
+IMAGE_ROOTFS ?= "${WORKDIR}/rootfs"
IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}"
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v5 8/9] bitbake.conf: set default QEMU_ARCH variables
2019-05-14 18:02 [PATCH v5 0/9] Cleanup rootfs creation Maxim Yu. Osipov
` (6 preceding siblings ...)
2019-05-14 18:02 ` [PATCH v5 7/9] image.bbclass: make IMAGE_ROOTFS overwritable Maxim Yu. Osipov
@ 2019-05-14 18:02 ` 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
9 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-14 18:02 UTC (permalink / raw)
To: isar-users
From: Claudius Heine <ch@denx.de>
Signed-off-by: Claudius Heine <ch@denx.de>
---
meta/conf/bitbake.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5edc5f1..381c121 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -54,6 +54,12 @@ CACHE = "${TMPDIR}/cache"
OVERRIDES = "${DISTRO_ARCH}:${MACHINE}:${DISTRO}:forcevariable"
+# Setting default QEMU_ARCH variables for different DISTRO_ARCH:
+QEMU_ARCH_amd64 = "x86_64"
+QEMU_ARCH_i386 = "i386"
+QEMU_ARCH_armhf = "arm"
+QEMU_ARCH_arm64 = "aarch64"
+
# Codename of the repository created by the caching class
DEBDISTRONAME = "isar"
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v5 9/9] buildchroot/configscript: make creation of builder uid/gid idempotent
2019-05-14 18:02 [PATCH v5 0/9] Cleanup rootfs creation Maxim Yu. Osipov
` (7 preceding siblings ...)
2019-05-14 18:02 ` [PATCH v5 8/9] bitbake.conf: set default QEMU_ARCH variables Maxim Yu. Osipov
@ 2019-05-14 18:03 ` Maxim Yu. Osipov
2019-05-15 6:43 ` [PATCH v5 0/9] Cleanup rootfs creation Claudius Heine
9 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-14 18:03 UTC (permalink / raw)
To: isar-users
From: Claudius Heine <ch@denx.de>
Signed-off-by: Claudius Heine <ch@denx.de>
---
meta/recipes-devtools/buildchroot/files/configscript.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/buildchroot/files/configscript.sh b/meta/recipes-devtools/buildchroot/files/configscript.sh
index 25a21ef..c4d8cf8 100644
--- a/meta/recipes-devtools/buildchroot/files/configscript.sh
+++ b/meta/recipes-devtools/buildchroot/files/configscript.sh
@@ -10,6 +10,6 @@ locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8
locales locales/default_environment_locale select en_US.UTF-8
END
-groupadd --system builder -o --gid $2
-useradd --system -o --uid $1 --gid builder --no-create-home --home /home/builder --no-user-group --comment "Isar buildchroot build user" builder
+grep -q "builder:x:$2" /etc/group || groupadd -f --system builder -o --gid $2
+grep -q "builder:x:$1" /etc/passwd || useradd --system -o --uid $1 --gid builder --no-create-home --home /home/builder --no-user-group --comment "Isar buildchroot build user" builder
chown -R builder:builder /home/builder
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v5 0/9] Cleanup rootfs creation
2019-05-14 18:02 [PATCH v5 0/9] Cleanup rootfs creation Maxim Yu. Osipov
` (8 preceding siblings ...)
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 ` Claudius Heine
2019-05-15 6:55 ` Maxim Yu. Osipov
9 siblings, 1 reply; 12+ messages in thread
From: Claudius Heine @ 2019-05-15 6:43 UTC (permalink / raw)
To: Maxim Yu. Osipov, isar-users
Hi Maxim,
On 14/05/2019 20.02, Maxim Yu. Osipov wrote:
> Hi,
>
> This is rebased version of v4 series against current 'next'.
Thx for the rebase. LGTM
regards,
Claudius
>
> Regards,
> Maxim.
>
> Claudius Heine (9):
> isar-bootstrap-host: disable DISTRO_BOOTSTRAP_KEYS usage
> isar-bootstrap-helper: move 'HOST_ARCH' and 'HOST_DISTRO' to
> base.bbclass
> move 'HOST_DISTRO_APT_SOURCES' from bootstrap-helper to isar-bootstrap
> buildchroot.bbclass: only cross build if HOST_ARCH != DISTRO_ARCH
> isar-bootstrap/buildchroot/sdkchroot: refactor PF and WORKDIR
> bitbake.conf: remove unneeded and differently used variables
> image.bbclass: make IMAGE_ROOTFS overwritable
> bitbake.conf: set default QEMU_ARCH variables
> buildchroot/configscript: make creation of builder uid/gid idempotent
>
> meta-isar/conf/multiconfig/rpi-stretch.conf | 1 +
> meta/classes/base.bbclass | 9 +++++++++
> meta/classes/buildchroot.bbclass | 2 +-
> meta/classes/image-sdk-extension.bbclass | 2 +-
> meta/classes/image.bbclass | 2 +-
> meta/classes/isar-bootstrap-helper.bbclass | 18 ++----------------
> meta/conf/bitbake.conf | 13 ++++++++-----
> .../recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 13 +++++--------
> .../isar-bootstrap/isar-bootstrap-target.bb | 6 +-----
> meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 1 +
> meta/recipes-devtools/buildchroot/buildchroot-host.bb | 3 ++-
> meta/recipes-devtools/buildchroot/buildchroot.inc | 3 +--
> .../recipes-devtools/buildchroot/files/configscript.sh | 4 ++--
> meta/recipes-devtools/sdkchroot/sdkchroot.bb | 5 ++---
> 14 files changed, 37 insertions(+), 45 deletions(-)
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v5 0/9] Cleanup rootfs creation
2019-05-15 6:43 ` [PATCH v5 0/9] Cleanup rootfs creation Claudius Heine
@ 2019-05-15 6:55 ` Maxim Yu. Osipov
0 siblings, 0 replies; 12+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-15 6:55 UTC (permalink / raw)
To: Claudius Heine, isar-users
Hi Claudius,
On 5/15/19 8:43 AM, Claudius Heine wrote:
> Hi Maxim,
>
> On 14/05/2019 20.02, Maxim Yu. Osipov wrote:
>> Hi,
>>
>> This is rebased version of v4 series against current 'next'.
>
> Thx for the rebase. LGTM
I've launched yesterday CI builds for this v5 series.
"Standard" CI passed OK:
http://isar-build.org:8080/job/isar_mosipov_next/200/console
"Fast" CI failed:
http://isar-build.org:8080/job/isar_mosipov_develop/110/console
If you want to look at the build logs for more details - the workspace
for the last build is not cleaned up - just go under
http://isar-build.org:8080/job/isar_mosipov_develop/ws/build/
Regards,
Maxim.
> regards,
> Claudius
>
>>
>> Regards,
>> Maxim.
>>
>> Claudius Heine (9):
>> isar-bootstrap-host: disable DISTRO_BOOTSTRAP_KEYS usage
>> isar-bootstrap-helper: move 'HOST_ARCH' and 'HOST_DISTRO' to
>> base.bbclass
>> move 'HOST_DISTRO_APT_SOURCES' from bootstrap-helper to isar-bootstrap
>> buildchroot.bbclass: only cross build if HOST_ARCH != DISTRO_ARCH
>> isar-bootstrap/buildchroot/sdkchroot: refactor PF and WORKDIR
>> bitbake.conf: remove unneeded and differently used variables
>> image.bbclass: make IMAGE_ROOTFS overwritable
>> bitbake.conf: set default QEMU_ARCH variables
>> buildchroot/configscript: make creation of builder uid/gid idempotent
>>
>> meta-isar/conf/multiconfig/rpi-stretch.conf | 1 +
>> meta/classes/base.bbclass | 9 +++++++++
>> meta/classes/buildchroot.bbclass | 2 +-
>> meta/classes/image-sdk-extension.bbclass | 2 +-
>> meta/classes/image.bbclass | 2 +-
>> meta/classes/isar-bootstrap-helper.bbclass | 18
>> ++----------------
>> meta/conf/bitbake.conf | 13
>> ++++++++-----
>> .../recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 13
>> +++++--------
>> .../isar-bootstrap/isar-bootstrap-target.bb | 6 +-----
>> meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 1 +
>> meta/recipes-devtools/buildchroot/buildchroot-host.bb | 3 ++-
>> meta/recipes-devtools/buildchroot/buildchroot.inc | 3 +--
>> .../recipes-devtools/buildchroot/files/configscript.sh | 4 ++--
>> meta/recipes-devtools/sdkchroot/sdkchroot.bb | 5 ++---
>> 14 files changed, 37 insertions(+), 45 deletions(-)
>>
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 12+ messages in thread