From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6497245309302734848 X-Received: by 10.80.242.138 with SMTP id f10mr9041960edm.11.1512757807260; Fri, 08 Dec 2017 10:30:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.144.196 with SMTP id d4ls1075145eda.4.gmail; Fri, 08 Dec 2017 10:30:06 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ1PgAuXeEuyz2Z1t8wMTXyJs+dV/fsHYP8OYFYduh0selbGr4dZExH0EufCOwbKdRziIVD X-Received: by 10.80.163.200 with SMTP id t8mr11382622edb.1.1512757806707; Fri, 08 Dec 2017 10:30:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512757806; cv=none; d=google.com; s=arc-20160816; b=C2hpwvm5Z5T8LnequYUaF4Y0PvH5xJTP8oKIHWvq3oM9sWMCCdVlIuggNuiPHMXsXA eqto5siDhCgEojTBscze1Z/EEpnWTbmTbdOF1jV0QMerjH46vEsBszYL31jWX99XiW9O XUwNse3CPUt5DLhxkfoxHWZ+hJSOEe4+igYIyiIzPzuNYBJlHuxsZYMtgc+tVcWbLCW3 H72cCQ4dwW/HQO0FEKPiQjfCCXkSI6ZnmO+ecA18IZinmprCbzs2ocmOD5ckvFlOGugx sKkGXYJHVLytfddAFeDLgg6qlV344CGCx+fugARoKjoT2B74UrNBeXwGSKmC55usZunD mFqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=04y2Pcx5asCc6kEK4mj/z2Buw62hghM5riwWA2VnFeQ=; b=H3NS/RoQ90ERmBnMJKlcG2owPspD2r0oOv8yp6AIrzsQtZqGctX9fWeJ7nmX8eavzG cknwJc8w/RsKl7LB1FFWLbQGOQKwSoSETRF45XdUhuuPFepgdK78SSSpxmLOTi5xL2ht 0oF303Oi/N8hpsSLjto7AoL/2f3P6JMDjpm7ejg0OzVGN8/nEs+5FqjryXxZQC1iEy8O CqX8+SJ4ZQ94uEA/62OOaCiCvKN35P3DOj6cCgEQhAtS8joCbQEg4nqjxPUybnhkWy9K 8MRKMq/E+6Lx5zkeraVD/wsUreq7ddgAI6fs8gX6TdwvXI8eAcZ3cVtadk+tRXlkK1IL w6Aw== 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 m7si698933edm.4.2017.12.08.10.30.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 10:30:06 -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 mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id vB8IU6kn027584 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 8 Dec 2017 19:30:06 +0100 Received: from md1em3qc.ww002.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id vB8IU6oi015614; Fri, 8 Dec 2017 19:30:06 +0100 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH 2/3] multistrap: Include -updates suite for distros that support it Date: Fri, 8 Dec 2017 19:30:03 +0100 Message-Id: <17be42ae4924dd6cf5fd099f3129f4caf17b7dac.1512757716.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <52fcea5998778d3372bdecd9f87c0fd36fc43ad6.1512757716.git.henning.schild@siemens.com> References: <52fcea5998778d3372bdecd9f87c0fd36fc43ad6.1512757716.git.henning.schild@siemens.com> In-Reply-To: <52fcea5998778d3372bdecd9f87c0fd36fc43ad6.1512757716.git.henning.schild@siemens.com> References: <52fcea5998778d3372bdecd9f87c0fd36fc43ad6.1512757716.git.henning.schild@siemens.com> X-TUID: ggeryPG+nvvq 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 --- 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