From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6490956644513480704 X-Received: by 10.80.174.140 with SMTP id e12mr5897401edd.12.1511293613075; Tue, 21 Nov 2017 11:46:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.219.194 with SMTP id s2ls1119783edk.5.gmail; Tue, 21 Nov 2017 11:46:52 -0800 (PST) X-Google-Smtp-Source: AGs4zMZcifEBGfkYi5fm0cIAlb3J5Lxu8fxUuq8rNcSuPtnAPFthJ+NknVeJrajsLudh6pgQMe1r X-Received: by 10.80.174.140 with SMTP id e12mr5897398edd.12.1511293612716; Tue, 21 Nov 2017 11:46:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511293612; cv=none; d=google.com; s=arc-20160816; b=TONviQYnFBH+47bP7ykuUSRGB0oG7u4vw89JsiC2ksmXrKJrN5HzmPgOU3co+N6IRQ 4alOq5SJjDwWL2t6qweekkPDWnjxvkRYOD2IWIHOjvZeLD/NrHz7P6m3hTF1TJdeBMsj DDmSRmWiCOW2w3LRQ3/Y+F6amS+fx5WvU0amr4d7bGtWhWc+yyLWUAbBxGr04he/NeA6 LXFDUzRxHkX3nfdfo8wrMf6a+3rNEqoN5jMuYoheWIYO2F3Z6qAsleGo2s0Il2pYAZSw 746orgU30qADg0TJklvqgmWVM8ZH7uwbieQ5pTpJeOlNxlLND6LPhNjLd9ififWDxLSm JK+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=TxndshS5o5pgbVWwkybl0kBwZloPQuvq9AQa5Ri/blY=; b=dhEwCG0a4q3T+nwa0vTILQruNdBYT469Q9gAujXaeNi1HTB5CIJogowpkfu3te1J00 OHMcg9yns0eP3GdFLOQlrkaCPVkgJ7Kof7/dkjV8aVczdOw9fb0eDv33Ml0XZzMSTeZh FEwqWzgdLjIuWtDnshUVgNUywo0clb2iTwed2wMpu804tNwJS4KPwGTqE3cc3rj+uOHv y5gEfby/y8lkxyErOOJbEoxIAG2VtsU5TPrTGHxjfB95xUin0V1mt3ldvZrTcTUW6Jmt KjqwJ32rpsyH49IDdJYJPiIir3oz+KhZ7WJMhiLcmZxfch0z8w2pemEc5ZBacI/wW0Ly yU+Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of gernot.hillier@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=gernot.hillier@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id q7si1208633edd.0.2017.11.21.11.46.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Nov 2017 11:46:52 -0800 (PST) Received-SPF: pass (google.com: domain of gernot.hillier@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of gernot.hillier@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=gernot.hillier@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id vALJkqAR018236 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 21 Nov 2017 20:46:52 +0100 Received: from linux-mf4q.internal.hillier.de ([167.87.32.175]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id vALJkoJ5019882; Tue, 21 Nov 2017 20:46:51 +0100 From: Gernot Hillier To: isar-users@googlegroups.com, christian.storm@siemens.com Cc: Gernot Hillier Subject: [PATCH] [WIP] Debian stretch: add complete Debian repositories Date: Tue, 21 Nov 2017 20:46:17 +0100 Message-Id: <20171121194617.6738-1-gernot.hillier@siemens.com> X-Mailer: git-send-email 2.13.6 X-TUID: /oOdt2ekzw0U 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?). Based on an initial patch by Henning Schild . 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## +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' \ -- 2.13.6