From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6490956644513480704 X-Received: by 10.80.242.138 with SMTP id f10mr231653edm.11.1511342267288; Wed, 22 Nov 2017 01:17:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.167.100 with SMTP id h91ls1743965edc.8.gmail; Wed, 22 Nov 2017 01:17:46 -0800 (PST) X-Google-Smtp-Source: AGs4zManuZ4RRdMYaj0qA5txnt15Ej4yI4get/QGI+iXev8PNBOfzjlozpumQqmFuhj8BqkCJOlM X-Received: by 10.80.195.1 with SMTP id a1mr2678568edb.8.1511342266761; Wed, 22 Nov 2017 01:17:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511342266; cv=none; d=google.com; s=arc-20160816; b=HuSS23VEG0oEFG9xK769P0kaxh0HHHZzLXAhp8a90FzDYOHyG4C7lYJJw6DcB6/lT8 uUPhgZ9DhHB9bXf7bnKxp/wWCe4M3CfZ4cHd/F+aFYpgjkM3qk5RBhC43hYhKvRe8VdW +NmEc0zEIxcrKSLleoL6bcP33sca+SEF2eTmEhudn73azzRPdNQZ7ls6LosuQIO/Y51L g3fgVB3yGFtIqOAuMcyvmm2VTg2eaC3zwE8gLNy7C3HQNeDmrUMAk9Jj+bUT6RVFTGs0 qrKO1lnnolTDkPy6qzx2MXAcjIkm7TMTyTrr+n8yVSqPVhQzNAgLkh5EDF8uQRgSqPgO Lbjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=yvD7Hp9sDSzRxCY+jFoYxFaNWfeSqcSOIJBaduZ+ang=; b=GACMJ0V9k9aB9ROc9yC65XMsQQRUqp9164sX0aotUvh4iVjy1sd4DN86+K6lZK5mRz X65XCrZNu03sG7jfGLC4vBjiubswv8QhfJsYXWTDPozVARl/Mv0r1GmYcC1wM/7YXKLh cTSute7z6iiYwXy/RoOIMNgp3XRjAd9glA8WGHuorn3ZTc30pOCU/udGEe3S2iXOceiK uPVI9/+yQCivzIn3okDEeomo5mZqyrAJJLnO9SUlQZ4+B8o8plwKDsUiGK+wkG2wYQmj FnK7wuUgsoOe2k3DnkqvZJYpyZ76OqJ90sVrEQBhkQ7rnmqT9Jq8Kzn+uUfDj73WmUrt ftNg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id h23si1587252ede.4.2017.11.22.01.17.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Nov 2017 01:17:46 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id vAM9HkEC012415 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 22 Nov 2017 10:17:46 +0100 Received: from md1em3qc ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id vAM9Hkuj002713; Wed, 22 Nov 2017 10:17:46 +0100 Date: Wed, 22 Nov 2017 10:18:04 +0100 From: Henning Schild To: "[ext] Gernot Hillier" Cc: , Subject: Re: [PATCH] [WIP] Debian stretch: add complete Debian repositories Message-ID: <20171122101804.0c23c36f@md1em3qc> In-Reply-To: <20171121194617.6738-1-gernot.hillier@siemens.com> References: <20171121194617.6738-1-gernot.hillier@siemens.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: ZcTluPz26jLa Am Tue, 21 Nov 2017 20:46:17 +0100 schrieb "[ext] Gernot Hillier" : > 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 > . Please turn that into a Signed-off-by. > Signed-off-by: Gernot Hillier > --- > 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' \