[PATCH 0/2] Some smaller fixes to the debootstrap patchset

[PATCH 0/2] Some smaller fixes to the debootstrap patchset

[claudius.heine.ext]

From: Claudius Heine <ch@denx.de>

Hi,

here are some smaller fixes to issues that I found with the
isar-bootstrap patchset.
Since they aren't really big issues, I haven't integrated them into the
patchset and further delayed the merge with a new version.

regards,
Claudius

Claudius Heine (2):
  Renamed 'Multistrap' references to 'Isar' (no functional change)
  isar-bootstrap: Change task dependencies to improve parallelization

 meta-isar/conf/local.conf.sample                   | 2 +-
 meta-isar/recipes-core/images/isar-image-base.bb   | 2 +-
 meta/recipes-core/isar-bootstrap/isar-bootstrap.bb | 7 ++++---
 meta/recipes-devtools/buildchroot/buildchroot.bb   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

-- 
2.16.3

[PATCH 1/2] Renamed 'Multistrap' references to 'Isar' (no functional change)

[claudius.heine.ext]

From: Claudius Heine <ch@denx.de>

A few references to 'Multistrap' could still be found in some files.
This patch removes them since multistrap is no longer used.

Signed-off-by: Claudius Heine <ch@denx.de>
---
 meta-isar/conf/local.conf.sample                 | 2 +-
 meta-isar/recipes-core/images/isar-image-base.bb | 2 +-
 meta/recipes-devtools/buildchroot/buildchroot.bb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 39875c1..390cc4c 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -21,7 +21,7 @@
 MACHINE ??= "qemuarm"
 
 #
-# Multistrap Configuration Selection
+# Isar Configuration Selection
 #
 # You need to select a specific distribution configuration which will used for both:
 # generation of buildchroot environment and target root filesystem.
diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index 37596ed..6b0030b 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -3,7 +3,7 @@
 # This software is a part of ISAR.
 # Copyright (C) 2015-2017 ilbers GmbH
 
-DESCRIPTION = "Multistrap target filesystem"
+DESCRIPTION = "Isar target filesystem"
 
 LICENSE = "gpl-2.0"
 LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index 690dab8..216df1e 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -3,7 +3,7 @@
 # This software is a part of ISAR.
 # Copyright (C) 2015-2016 ilbers GmbH
 
-DESCRIPTION = "Multistrap development filesystem"
+DESCRIPTION = "Isar development filesystem"
 
 LICENSE = "gpl-2.0"
 LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
-- 
2.16.3

[PATCH 2/2] isar-bootstrap: Change task dependencies to improve parallelization

[claudius.heine.ext]

From: Claudius Heine <ch@denx.de>

The isar-bootstrap tasks are currently ordered linearly. This patch
changes this to better model the real dependencies between them. Now
some tasks are executed in parallel if possible. This should slightly
improve the performance.

In detail 'do_apt_config_prepare' can be executed in parallel to
'do_generate_keyring' and 'do_bootstrap'. 'do_apt_config_install' has to
be executed after 'do_bootstrap' and 'do_apt_config_prepare'.

Signed-off-by: Claudius Heine <ch@denx.de>
---
 meta/recipes-core/isar-bootstrap/isar-bootstrap.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb
index 3fbf890..aae760e 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb
@@ -162,6 +162,7 @@ do_generate_keyring() {
 addtask generate_keyring before do_build after do_unpack
 
 do_apt_config_prepare[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
+do_apt_config_prepare[dirs] = "${WORKDIR}"
 do_apt_config_prepare[vardeps] += "\
                                    APTPREFS \
                                    DISTRO_APT_PREFERENCES \
@@ -180,7 +181,7 @@ python do_apt_config_prepare() {
 
     aggregate_aptsources_list(d, apt_sources_list, apt_sources_out)
 }
-addtask apt_config_prepare before do_build after do_generate_keyring
+addtask apt_config_prepare before do_build after do_unpack
 
 do_bootstrap[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
 do_bootstrap[vardeps] += "DISTRO_APT_SOURCES"
@@ -201,7 +202,7 @@ do_bootstrap() {
                              "${ROOTFSDIR}" \
                              "${@get_distro_source(d)}"
 }
-addtask bootstrap before do_build after do_apt_config_prepare
+addtask bootstrap before do_build after do_generate_keyring
 
 do_apt_config_install[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
 do_apt_config_install() {
@@ -216,7 +217,7 @@ do_apt_config_install() {
     sudo install -v -m644 "${WORKDIR}/isar-apt.conf" \
                           "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf"
 }
-addtask apt_config_install before do_build after do_bootstrap
+addtask apt_config_install before do_build after do_bootstrap do_apt_config_prepare
 
 do_apt_update[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
 do_apt_update() {
-- 
2.16.3