[PATCH 1/3] image: fix do_populate package-name assumption

[PATCH 1/3] image: fix do_populate package-name assumption

[Henning Schild]

do_populate assumes that every item in IMAGE_INSTALL will produce
.deb-files with the name ${PN}_*.deb. But that assumption might not
be correct for every recipe.
One example could be a kernel-recipe where you get "linux-image",
"linux-headers", "linux-firmware-image". Another example could be a
recipe that just fetches a few .debs from somewhere and never even
creates a ${PN}_*.deb.
Instead of looping over IMAGE_INSTALL and calling reprepro multiple
times, just call it once on all the .debs we find in DEPLOY_DIR_DEB.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/image.bbclass | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2c2bafc..b37358e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -71,13 +71,11 @@ do_populate[stamp-extra-info] = "${DISTRO}-${MACHINE}"
 # Populate Isar apt repository by newly built packages
 do_populate() {
     if [ -n "${IMAGE_INSTALL}" ]; then
-        for p in ${IMAGE_INSTALL}; do
-            call_reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
-                          --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
-                          -C main \
-                          includedeb ${DEBDISTRONAME} \
-                          ${DEPLOY_DIR_DEB}/${p}_*.deb
-        done
+        call_reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
+                      --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
+                      -C main \
+                      includedeb ${DEBDISTRONAME} \
+                      ${DEPLOY_DIR_DEB}/*.deb
     fi
 }
 
-- 
2.13.6

[PATCH 2/3] multistrap: Include -updates suite for distros that support it

[Henning Schild]

Add a second default suite to the image and buildchroot multistrap
config. That works for the three debian DISTROs that Isar supports at
the moment. And those use it, raspbian does not use it.

The result is that you should now get the latest dot-release in
buildchroot and the image.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta-isar/conf/distro/debian-jessie.conf                   |  2 ++
 meta-isar/conf/distro/debian-stretch.conf                  |  2 ++
 meta-isar/conf/distro/debian-wheezy.conf                   |  2 ++
 meta-isar/conf/distro/raspbian-jessie.conf                 |  2 ++
 meta-isar/recipes-core/images/files/multistrap.conf.in     | 12 +++++++++---
 meta-isar/recipes-core/images/isar-image-base.bb           |  3 ++-
 meta/recipes-devtools/buildchroot/buildchroot.bb           |  3 ++-
 meta/recipes-devtools/buildchroot/files/multistrap.conf.in | 12 +++++++++---
 8 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/meta-isar/conf/distro/debian-jessie.conf b/meta-isar/conf/distro/debian-jessie.conf
index 2a5d29f..46807d4 100644
--- a/meta-isar/conf/distro/debian-jessie.conf
+++ b/meta-isar/conf/distro/debian-jessie.conf
@@ -7,3 +7,5 @@ DISTRO_SUITE ?= "jessie"
 DISTRO_COMPONENTS ?= "main contrib non-free"
 DISTRO_APT_SOURCE ?= "http://ftp.debian.org/debian"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+DISTRO_MULTICONF_BOOTSTRAP ?= "base updates"
+DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}"
diff --git a/meta-isar/conf/distro/debian-stretch.conf b/meta-isar/conf/distro/debian-stretch.conf
index de6af63..c2f7f9a 100644
--- a/meta-isar/conf/distro/debian-stretch.conf
+++ b/meta-isar/conf/distro/debian-stretch.conf
@@ -5,3 +5,5 @@ DISTRO_SUITE ?= "stretch"
 DISTRO_COMPONENTS ?= "main contrib non-free"
 DISTRO_APT_SOURCE ?= "http://ftp.debian.org/debian"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+DISTRO_MULTICONF_BOOTSTRAP ?= "base updates"
+DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}"
diff --git a/meta-isar/conf/distro/debian-wheezy.conf b/meta-isar/conf/distro/debian-wheezy.conf
index 1892ed9..e16de0e 100644
--- a/meta-isar/conf/distro/debian-wheezy.conf
+++ b/meta-isar/conf/distro/debian-wheezy.conf
@@ -7,3 +7,5 @@ DISTRO_SUITE ?= "wheezy"
 DISTRO_COMPONENTS ?= "main contrib non-free"
 DISTRO_APT_SOURCE ?= "http://ftp.debian.org/debian"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
+DISTRO_MULTICONF_BOOTSTRAP ?= "base updates"
+DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}"
diff --git a/meta-isar/conf/distro/raspbian-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf
index 70066d5..bd3be29 100644
--- a/meta-isar/conf/distro/raspbian-jessie.conf
+++ b/meta-isar/conf/distro/raspbian-jessie.conf
@@ -7,3 +7,5 @@ DISTRO_SUITE ?= "jessie"
 DISTRO_COMPONENTS ?= "main contrib non-free firmware"
 DISTRO_APT_SOURCE ?= "http://archive.raspbian.org/raspbian"
 DISTRO_CONFIG_SCRIPT ?= "raspbian-configscript.sh"
+DISTRO_MULTICONF_BOOTSTRAP ?= "base"
+DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}"
diff --git a/meta-isar/recipes-core/images/files/multistrap.conf.in b/meta-isar/recipes-core/images/files/multistrap.conf.in
index 491e5a2..439f726 100644
--- a/meta-isar/recipes-core/images/files/multistrap.conf.in
+++ b/meta-isar/recipes-core/images/files/multistrap.conf.in
@@ -4,19 +4,25 @@
 [General]
 noauth=true
 unpack=true
-bootstrap=##DISTRO## Isar
-aptsources=##DISTRO##
+bootstrap=##DISTRO_MULTICONF_BOOTSTRAP## Isar
+aptsources=##DISTRO_MULTICONF_APTSOURCES##
 configscript=##CONFIG_SCRIPT##
 setupscript=##SETUP_SCRIPT##
 hookdir=##DIR_HOOKS##
 
-[##DISTRO##]
+[base]
 source=##DISTRO_APT_SOURCE##
 suite=##DISTRO_SUITE##
 components=##DISTRO_COMPONENTS##
 packages=##IMAGE_PREINSTALL##
 omitdebsrc=true
 
+[updates]
+source=##DISTRO_APT_SOURCE##
+suite=##DISTRO_SUITE##-updates
+components=##DISTRO_COMPONENTS##
+omitdebsrc=true
+
 [Isar]
 packages=##IMAGE_INSTALL##
 source=##DEPLOY_DIR_APT##
diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index c2150b1..6f54735 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -40,7 +40,8 @@ do_rootfs() {
 
     # Adjust multistrap config
     sed -e 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|g' \
-        -e 's|##DISTRO##|${DISTRO}|g' \
+        -e 's|##DISTRO_MULTICONF_BOOTSTRAP##|${DISTRO_MULTICONF_BOOTSTRAP}|g' \
+        -e 's|##DISTRO_MULTICONF_APTSOURCES##|${DISTRO_MULTICONF_APTSOURCES}|g' \
         -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \
         -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \
         -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index 6a94733..dced8c0 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -43,7 +43,8 @@ do_build() {
 
     # Adjust multistrap config
     sed -e 's|##BUILDCHROOT_PREINSTALL##|${BUILDCHROOT_PREINSTALL}|g' \
-        -e 's|##DISTRO##|${DISTRO}|g' \
+        -e 's|##DISTRO_MULTICONF_BOOTSTRAP##|${DISTRO_MULTICONF_BOOTSTRAP}|g' \
+        -e 's|##DISTRO_MULTICONF_APTSOURCES##|${DISTRO_MULTICONF_APTSOURCES}|g' \
         -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \
         -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \
         -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \
diff --git a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in
index 7e88608..53731b5 100644
--- a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in
+++ b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in
@@ -4,15 +4,21 @@
 [General]
 noauth=true
 unpack=true
-bootstrap=##DISTRO##
-aptsources=##DISTRO##
+bootstrap=##DISTRO_MULTICONF_BOOTSTRAP##
+aptsources=##DISTRO_MULTICONF_APTSOURCES##
 configscript=##CONFIG_SCRIPT##
 setupscript=##SETUP_SCRIPT##
 hookdir=##DIR_HOOKS##
 
-[##DISTRO##]
+[base]
 source=##DISTRO_APT_SOURCE##
 suite=##DISTRO_SUITE##
 components=##DISTRO_COMPONENTS##
 packages=##BUILDCHROOT_PREINSTALL##
 omitdebsrc=true
+
+[updates]
+source=##DISTRO_APT_SOURCE##
+suite=##DISTRO_SUITE##-updates
+components=##DISTRO_COMPONENTS##
+omitdebsrc=true
-- 
2.13.6

[PATCH 3/3] multistrap: include security suite for distros that support it

[Henning Schild]

Similar to the previous patch. Add a new section to the two multistrap
configs and use it on targets that support it.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta-isar/conf/distro/debian-jessie.conf                   | 3 ++-
 meta-isar/conf/distro/debian-stretch.conf                  | 3 ++-
 meta-isar/conf/distro/debian-wheezy.conf                   | 3 ++-
 meta-isar/conf/distro/raspbian-jessie.conf                 | 1 +
 meta-isar/recipes-core/images/files/multistrap.conf.in     | 6 ++++++
 meta-isar/recipes-core/images/isar-image-base.bb           | 1 +
 meta/recipes-devtools/buildchroot/buildchroot.bb           | 1 +
 meta/recipes-devtools/buildchroot/files/multistrap.conf.in | 6 ++++++
 8 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/meta-isar/conf/distro/debian-jessie.conf b/meta-isar/conf/distro/debian-jessie.conf
index 46807d4..d4bc4b1 100644
--- a/meta-isar/conf/distro/debian-jessie.conf
+++ b/meta-isar/conf/distro/debian-jessie.conf
@@ -6,6 +6,7 @@
 DISTRO_SUITE ?= "jessie"
 DISTRO_COMPONENTS ?= "main contrib non-free"
 DISTRO_APT_SOURCE ?= "http://ftp.debian.org/debian"
+DISTRO_APT_SOURCE_SEC ?= "http://security.debian.org/debian-security"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
-DISTRO_MULTICONF_BOOTSTRAP ?= "base updates"
+DISTRO_MULTICONF_BOOTSTRAP ?= "base updates security"
 DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}"
diff --git a/meta-isar/conf/distro/debian-stretch.conf b/meta-isar/conf/distro/debian-stretch.conf
index c2f7f9a..74177fd 100644
--- a/meta-isar/conf/distro/debian-stretch.conf
+++ b/meta-isar/conf/distro/debian-stretch.conf
@@ -4,6 +4,7 @@
 DISTRO_SUITE ?= "stretch"
 DISTRO_COMPONENTS ?= "main contrib non-free"
 DISTRO_APT_SOURCE ?= "http://ftp.debian.org/debian"
+DISTRO_APT_SOURCE_SEC ?= "http://security.debian.org/debian-security"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
-DISTRO_MULTICONF_BOOTSTRAP ?= "base updates"
+DISTRO_MULTICONF_BOOTSTRAP ?= "base updates security"
 DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}"
diff --git a/meta-isar/conf/distro/debian-wheezy.conf b/meta-isar/conf/distro/debian-wheezy.conf
index e16de0e..017316e 100644
--- a/meta-isar/conf/distro/debian-wheezy.conf
+++ b/meta-isar/conf/distro/debian-wheezy.conf
@@ -6,6 +6,7 @@
 DISTRO_SUITE ?= "wheezy"
 DISTRO_COMPONENTS ?= "main contrib non-free"
 DISTRO_APT_SOURCE ?= "http://ftp.debian.org/debian"
+DISTRO_APT_SOURCE_SEC ?= "http://security.debian.org/debian-security"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
-DISTRO_MULTICONF_BOOTSTRAP ?= "base updates"
+DISTRO_MULTICONF_BOOTSTRAP ?= "base updates security"
 DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}"
diff --git a/meta-isar/conf/distro/raspbian-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf
index bd3be29..bd3c280 100644
--- a/meta-isar/conf/distro/raspbian-jessie.conf
+++ b/meta-isar/conf/distro/raspbian-jessie.conf
@@ -6,6 +6,7 @@
 DISTRO_SUITE ?= "jessie"
 DISTRO_COMPONENTS ?= "main contrib non-free firmware"
 DISTRO_APT_SOURCE ?= "http://archive.raspbian.org/raspbian"
+DISTRO_APT_SOURCE_SEC ?= ""
 DISTRO_CONFIG_SCRIPT ?= "raspbian-configscript.sh"
 DISTRO_MULTICONF_BOOTSTRAP ?= "base"
 DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}"
diff --git a/meta-isar/recipes-core/images/files/multistrap.conf.in b/meta-isar/recipes-core/images/files/multistrap.conf.in
index 439f726..e49f473 100644
--- a/meta-isar/recipes-core/images/files/multistrap.conf.in
+++ b/meta-isar/recipes-core/images/files/multistrap.conf.in
@@ -23,6 +23,12 @@ suite=##DISTRO_SUITE##-updates
 components=##DISTRO_COMPONENTS##
 omitdebsrc=true
 
+[security]
+source=##DISTRO_APT_SOURCE_SEC##
+suite=##DISTRO_SUITE##/updates
+components=##DISTRO_COMPONENTS##
+omitdebsrc=true
+
 [Isar]
 packages=##IMAGE_INSTALL##
 source=##DEPLOY_DIR_APT##
diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index 6f54735..d8a6b30 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -43,6 +43,7 @@ do_rootfs() {
         -e 's|##DISTRO_MULTICONF_BOOTSTRAP##|${DISTRO_MULTICONF_BOOTSTRAP}|g' \
         -e 's|##DISTRO_MULTICONF_APTSOURCES##|${DISTRO_MULTICONF_APTSOURCES}|g' \
         -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \
+        -e 's|##DISTRO_APT_SOURCE_SEC##|${DISTRO_APT_SOURCE_SEC}|g' \
         -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \
         -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \
         -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/${DISTRO_CONFIG_SCRIPT}|g' \
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index dced8c0..4a1b83a 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -46,6 +46,7 @@ do_build() {
         -e 's|##DISTRO_MULTICONF_BOOTSTRAP##|${DISTRO_MULTICONF_BOOTSTRAP}|g' \
         -e 's|##DISTRO_MULTICONF_APTSOURCES##|${DISTRO_MULTICONF_APTSOURCES}|g' \
         -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \
+        -e 's|##DISTRO_APT_SOURCE_SEC##|${DISTRO_APT_SOURCE_SEC}|g' \
         -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \
         -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \
         -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \
diff --git a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in
index 53731b5..49f5bbc 100644
--- a/meta/recipes-devtools/buildchroot/files/multistrap.conf.in
+++ b/meta/recipes-devtools/buildchroot/files/multistrap.conf.in
@@ -22,3 +22,9 @@ source=##DISTRO_APT_SOURCE##
 suite=##DISTRO_SUITE##-updates
 components=##DISTRO_COMPONENTS##
 omitdebsrc=true
+
+[security]
+source=##DISTRO_APT_SOURCE_SEC##
+suite=##DISTRO_SUITE##/updates
+components=##DISTRO_COMPONENTS##
+omitdebsrc=true
-- 
2.13.6

Re: [PATCH 1/3] image: fix do_populate package-name assumption

[Henning Schild]

These patches are currently being build by CI, you know which branch
and how to find it. Just as a sidenote, from now on all of the patches
i post will have gone through CI or are currently running.

Henning

Am Fri, 8 Dec 2017 19:30:02 +0100
schrieb Henning Schild <henning.schild@siemens.com>:

> do_populate assumes that every item in IMAGE_INSTALL will produce
> .deb-files with the name ${PN}_*.deb. But that assumption might not
> be correct for every recipe.
> One example could be a kernel-recipe where you get "linux-image",
> "linux-headers", "linux-firmware-image". Another example could be a
> recipe that just fetches a few .debs from somewhere and never even
> creates a ${PN}_*.deb.
> Instead of looping over IMAGE_INSTALL and calling reprepro multiple
> times, just call it once on all the .debs we find in DEPLOY_DIR_DEB.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta/classes/image.bbclass | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 2c2bafc..b37358e 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -71,13 +71,11 @@ do_populate[stamp-extra-info] =
> "${DISTRO}-${MACHINE}" # Populate Isar apt repository by newly built
> packages do_populate() {
>      if [ -n "${IMAGE_INSTALL}" ]; then
> -        for p in ${IMAGE_INSTALL}; do
> -            call_reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
> -                          --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
> -                          -C main \
> -                          includedeb ${DEBDISTRONAME} \
> -                          ${DEPLOY_DIR_DEB}/${p}_*.deb
> -        done
> +        call_reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
> +                      --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
> +                      -C main \
> +                      includedeb ${DEBDISTRONAME} \
> +                      ${DEPLOY_DIR_DEB}/*.deb
>      fi
>  }
>  

Re: [PATCH 1/3] image: fix do_populate package-name assumption

[Alexander Smirnov]

[...]

Applied to next, thanks!

Alex