From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6497245309302734848 X-Received: by 10.223.141.212 with SMTP id o78mr3583451wrb.13.1512757807388; Fri, 08 Dec 2017 10:30:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.193.142 with SMTP id r136ls383290wmf.0.canary-gmail; Fri, 08 Dec 2017 10:30:06 -0800 (PST) X-Google-Smtp-Source: AGs4zMYuKec4h+wHyI1JHq13FRbod8Eb+e2r/zKdL2sgH1f2Hq4IB1LMwbIyph3AxjTKt9MT+Idk X-Received: by 10.28.241.7 with SMTP id p7mr707067wmh.30.1512757806826; 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=pV6UQfzOqk2DCFF24LgV55K/VRRAyaSK1GuAewxXoluotP7J37992OhlIlEK1bQRSZ +rJsFlIIGXhfenXNHcQwxnfQho5y2oWVp6ZQjsNk7zPXJ5DvDIuRpUS3X20YQzEowj2r jHwzgyZPqNK+NL4GiA4R89606taRDigpDDxpinb+QGmBJNUHt0NpodnPCB5OMawhM2ay YNiSobrwqNK7YJ0V8N6B3DhQaf52XDR6OOMoVcaw3wTnel+DSIdma0uyK44SFpHw1MO6 fXNMo95DBnEBTX95VrwevmJ705RcnGRYwyFLlY2s0oq4azu2c3ZeDfNZP7Jb6T4qjv6v kPNA== 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=0T89ia9hgQv/veth+CpCHQHbGgbVvlA1yWw4ysB/sCA=; b=SdPAijtsBm/JVp+cLLrHxT+QO8j7CKNBsiEt8QnFmQ9pgTQ3UwMLATcAlJ1S1UdJFx aEhf3MalJmfHinee/gQ4ZOkpADDD1ylGzdw61aUJlxxDc6XdnqHJaA38BkTQZKyp7FYR 7XHpWqbDoOTDY+uKktJkzB89QN5qj3VCgJwTSx7zwpnv+ByQT1PXhno0KBhCAkY+gHIc eJb3fOgvqxk6ZPNdHB45TVLJ5F77xx7LMV33e41K2OZRuYIS7ohJwe6zwgmHeKyLk7uh x8N0cvXWG+edkvP6NPeb4PcckV4r8I5SK0PYHrN8tT3DBaTJCYRyBz2IBDJFVj9AkQd+ SYtg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id e80si240683wmi.2.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.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id vB8IU6Z0002184 (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 vB8IU6oj015614; Fri, 8 Dec 2017 19:30:06 +0100 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH 3/3] multistrap: include security suite for distros that support it Date: Fri, 8 Dec 2017 19:30:04 +0100 Message-Id: <0c8710a9d64933864452dc5debce7823274313b4.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: Ao16z3QxjV37 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 --- 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