Re: [PATCH] [WIP] Debian stretch: add complete Debian repositories

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 21 Nov 2017 20:46:17 +0100
schrieb "[ext] Gernot Hillier" <gernot.hillier@siemens.com>:

> To get a recent Debian image, distro "stretch" is not sufficient, but
> we need stretch-updates plus stretch/updates from security.debian.org.
> 
> This patch is a WIP - it lacks corresponding changes to
> multistrap.conf.in from recipes-devtools/buildchroot and the image
> recipes for Raspbian (and older Debian versions?).

You should modify the multistrap config for buildchroot as well and
test at least on debian-stretch.

After that it is probably ok to update the other distros to your best
knowledge and let Alex give it to CI. Or maybe Alex will pick it up and
do the remaining work.

> Based on an initial patch by Henning Schild
> <henning.schild@siemens.com>.

Please turn that into a Signed-off-by.

> Signed-off-by: Gernot Hillier <gernot.hillier@siemens.com>
> ---
>  meta-isar/conf/distro/debian-stretch.conf              |  2 ++
>  meta-isar/recipes-core/images/files/multistrap.conf.in | 17
> +++++++++++++++--
> meta-isar/recipes-core/images/isar-image-base.bb       |  2 ++ 3
> files changed, 19 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-isar/conf/distro/debian-stretch.conf
> b/meta-isar/conf/distro/debian-stretch.conf index de6af63..8921505
> 100644 --- a/meta-isar/conf/distro/debian-stretch.conf
> +++ b/meta-isar/conf/distro/debian-stretch.conf
> @@ -2,6 +2,8 @@
>  # Copyright (C) 2017 ilbers GmbH
>  
>  DISTRO_SUITE ?= "stretch"
> +DISTRO_SEC_SUITE ?= "${DISTRO_SUITE}/updates"
>  DISTRO_COMPONENTS ?= "main contrib non-free"
>  DISTRO_APT_SOURCE ?= "http://ftp.debian.org/debian"
> +DISTRO_SEC_APT_SOURCE ?= "http://security.debian.org/"
>  DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
> diff --git a/meta-isar/recipes-core/images/files/multistrap.conf.in
> b/meta-isar/recipes-core/images/files/multistrap.conf.in index
> 491e5a2..9924781 100644 ---
> a/meta-isar/recipes-core/images/files/multistrap.conf.in +++
> b/meta-isar/recipes-core/images/files/multistrap.conf.in @@ -4,8 +4,8
> @@ [General]
>  noauth=true
>  unpack=true
> -bootstrap=##DISTRO## Isar
> -aptsources=##DISTRO##
> +bootstrap=##DISTRO## ##DISTRO##-updates ##DISTRO##-security Isar
> +aptsources=##DISTRO## ##DISTRO##-updates ##DISTRO##-security
>  configscript=##CONFIG_SCRIPT##
>  setupscript=##SETUP_SCRIPT##
>  hookdir=##DIR_HOOKS##
> @@ -17,6 +17,19 @@ components=##DISTRO_COMPONENTS##
>  packages=##IMAGE_PREINSTALL##
>  omitdebsrc=true
>  
> +[##DISTRO##-updates]
> +source=##DISTRO_APT_SOURCE##
> +suite=##DISTRO_SUITE##-updates
> +components=##DISTRO_COMPONENTS##
> +omitdebsrc=true
> +
> +[##DISTRO##-security]
> +source=##DISTRO_SEC_APT_SOURCE##
> +suite=##DISTRO_SEC_SUITE##
> +components=##DISTRO_COMPONENTS##
> +#packages=##IMAGE_PREINSTALL##

skip this comment

Henning

> +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
> 121b586..cc8853f 100644 ---
> a/meta-isar/recipes-core/images/isar-image-base.bb +++
> b/meta-isar/recipes-core/images/isar-image-base.bb @@ -41,7 +41,9 @@
> do_rootfs() { sed -e 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|g' \
>          -e 's|##DISTRO##|${DISTRO}|g' \
>          -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \
> +        -e 's|##DISTRO_SEC_APT_SOURCE##|${DISTRO_SEC_APT_SOURCE}|g' \
>          -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \
> +        -e 's|##DISTRO_SEC_SUITE##|${DISTRO_SEC_SUITE}|g' \
>          -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \
>          -e
> 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/${DISTRO_CONFIG_SCRIPT}|g' \
> -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \