From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6524973730788016128 X-Received: by 10.28.124.23 with SMTP id x23mr538217wmc.16.1519305548357; Thu, 22 Feb 2018 05:19:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.71.210 with SMTP id m79ls873216wmi.10.canary-gmail; Thu, 22 Feb 2018 05:19:07 -0800 (PST) X-Google-Smtp-Source: AH8x225PdFz2k118S4lYFiKL1g2dgKL971bFr9fHyJsCP/BoAjrEXVOZXy/zvQzTiz1vnqWLNsl/ X-Received: by 10.28.87.5 with SMTP id l5mr597457wmb.23.1519305547945; Thu, 22 Feb 2018 05:19:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519305547; cv=none; d=google.com; s=arc-20160816; b=zmRgWjbiqwHqjdcPBS/QvEOhVUzHceG+1gt3Wq0JNrQN6VOHAyzuadSGFtFcYZws4c TIsqDXsP4OGWznBkMJIJjp7ePTRDidR94v3Znw1HTMpjSvFyqf1EI5U6hkZic6g4M8AR tZrex+zBnw7JFVY/qvAxsx23I2N98NSZr0cI9SA27d4Wf8XqW1h+xz7RFPxQQBZk/6uJ fxX8nkQTtfKfOgUu2Ir9VXwNajZisboZRxQ102+lxeheXYgKqU4DvA6bCclU+aXvqOrW ztUBRiUCVvvFv01xasMEIvRwndSRMZApoJLPOEyRA+pu5jjitpa9nHJGY63gUEsa8T7X TrGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=254F1l5NaxYFlvSRfeWII8ObGbYk5mfn+3z61zTXz5E=; b=CrgmoKMg1LKp42qY8BOPV2LgvsZssjn8gEt+1IzkIkQmT0R9XI2wskBiYsnu9DL/ja JZhVtPFJLH7If4Y7PhYu7NVJ6kW+6pQRnlMfm+tNYROvSCvWGWkeG2230czHwNekXdPu L4gOLaVX44Ti0AxY6zko9nDARe0rdxG/A60fHLntr2xRk0Qmjz968l33xNor34HjNeXu 9n7GcvQ2jpa9t05vxsNk7btVRh4LRaDwYaD2qs0/mKyh/SE3ghzfNmJhahEmNfBJHzTn kTXebkIFzdCYftIL9d1UvR5ncZE3ImVH0oD+0eyYYq9X3kwZaM/gAAqLt+GMh9V57rti +EBA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id i44si3637wri.1.2018.02.22.05.19.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 05:19:07 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@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 claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w1MDJ71a015281 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2018 14:19:07 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.68.223]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w1MDJ6Tj022389; Thu, 22 Feb 2018 14:19:07 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 5/5] meta-isar/multiconfig: remove multistrap references Date: Thu, 22 Feb 2018 14:19:01 +0100 Message-Id: <20180222131901.20915-6-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180222131901.20915-1-claudius.heine.ext@siemens.com> References: <20180222131901.20915-1-claudius.heine.ext@siemens.com> X-TUID: UGQ+rxWYW0uN From: Claudius Heine This patch removes the left-over references to multistrap from the configuration files. Signed-off-by: Claudius Heine --- meta-isar/conf/distro/debian-jessie.conf | 5 ----- meta-isar/conf/distro/debian-stretch.conf | 5 ----- meta-isar/conf/distro/debian-wheezy.conf | 5 ----- meta-isar/conf/distro/raspbian-jessie.conf | 5 ----- meta-isar/conf/multiconfig/qemuarm-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 2 +- meta-isar/conf/multiconfig/rpi-jessie.conf | 2 +- 7 files changed, 3 insertions(+), 23 deletions(-) diff --git a/meta-isar/conf/distro/debian-jessie.conf b/meta-isar/conf/distro/debian-jessie.conf index d7efa63..ce7d049 100644 --- a/meta-isar/conf/distro/debian-jessie.conf +++ b/meta-isar/conf/distro/debian-jessie.conf @@ -13,8 +13,3 @@ DISTRO_KERNELS ?= "486 4kc-malta 586 5kc-malta 686-pae amd64 arm64 armmp \ armmp-lpae ixp4xx kirkwood loongson-2e loongson-2f loongson-3 octeon \ orion5x powerpc powerpc-smp powerpc64 powerpc64le r4k-ip22 r5k-ip32 \ s390x sb1-bcm91250a versatile" - -# No longer needed: -DISTRO_APT_SOURCE_SEC ?= "http://security.debian.org/debian-security" -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 26a08c5..000317b 100644 --- a/meta-isar/conf/distro/debian-stretch.conf +++ b/meta-isar/conf/distro/debian-stretch.conf @@ -10,8 +10,3 @@ DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \ armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \ rt-686-pae rt-amd64 s390x" - -# No longer needed: -DISTRO_APT_SOURCE_SEC ?= "http://security.debian.org/debian-security" -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 de7a10f..e9065f5 100644 --- a/meta-isar/conf/distro/debian-wheezy.conf +++ b/meta-isar/conf/distro/debian-wheezy.conf @@ -11,8 +11,3 @@ DISTRO_APT_SOURCES += "conf/distro/debian-wheezy.list" DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_KERNELS ?= "486 686-pae amd64 rt-686-pae rt-amd64 versatile vexpress \ iop32x ixp4xx kirkwood mv78xx0 mx5 omap orion5x" - -# No longer needed: -DISTRO_APT_SOURCE_SEC ?= "http://security.debian.org/debian-security" -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 0d66905..51d3023 100644 --- a/meta-isar/conf/distro/raspbian-jessie.conf +++ b/meta-isar/conf/distro/raspbian-jessie.conf @@ -9,8 +9,3 @@ DISTRO_COMPONENTS ?= "main contrib non-free firmware" DISTRO_APT_SOURCE ?= "http://archive.raspbian.org/raspbian" DISTRO_CONFIG_SCRIPT?= "raspbian-configscript.sh" DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv" - -# No longer needed: -DISTRO_APT_SOURCE_SEC ?= "" -DISTRO_MULTICONF_BOOTSTRAP ?= "base" -DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}" diff --git a/meta-isar/conf/multiconfig/qemuarm-jessie.conf b/meta-isar/conf/multiconfig/qemuarm-jessie.conf index 74fb7d9..fe1d760 100644 --- a/meta-isar/conf/multiconfig/qemuarm-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuarm-jessie.conf @@ -9,7 +9,7 @@ # This sets the default machine to be qemuarm in this configuration: MACHINE ?= "qemuarm" -# This sets the default multistrap configuration: +# This sets the default distribution configuration: DISTRO ?= "debian-jessie" DISTRO_ARCH ?= "armhf" diff --git a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf index 11355a4..c573254 100644 --- a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf +++ b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf @@ -9,7 +9,7 @@ # This sets the default machine to be qemuarm in this configuration: MACHINE ?= "qemuarm" -# This sets the default multistrap configuration: +# This sets the default distribution configuration: DISTRO ?= "debian-wheezy" DISTRO_ARCH ?= "armhf" diff --git a/meta-isar/conf/multiconfig/rpi-jessie.conf b/meta-isar/conf/multiconfig/rpi-jessie.conf index 3f33731..fcc10d9 100644 --- a/meta-isar/conf/multiconfig/rpi-jessie.conf +++ b/meta-isar/conf/multiconfig/rpi-jessie.conf @@ -9,7 +9,7 @@ # This sets the default machine to be rpi in this configuration: MACHINE ?= "rpi" -# This sets the default multistrap configuration: +# This sets the default distribution configuration: DISTRO ?= "raspbian-jessie" DISTRO_ARCH ?= "armhf" -- 2.16.1