From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6524973730788016128 X-Received: by 10.46.114.9 with SMTP id n9mr1577802ljc.30.1520441104406; Wed, 07 Mar 2018 08:45:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.64.15 with SMTP id n15ls245938lja.6.gmail; Wed, 07 Mar 2018 08:45:03 -0800 (PST) X-Google-Smtp-Source: AG47ELv3uK0R55Z7DMMIOIoptBJQfG/WCZM8ka9aRRGs8JoC0DJqBfQwWiNPOe6YSpQwKIlPZ+ZX X-Received: by 10.46.108.2 with SMTP id h2mr1535731ljc.19.1520441103867; Wed, 07 Mar 2018 08:45:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520441103; cv=none; d=google.com; s=arc-20160816; b=08FRzEECOPhj4tYg/UzPqoulNRCKdF9jrbFqFPTPoFh7tFcF84GlXDVkAofRaKZaQY zAWWyZWD1sqatDR8/YaN3tnyIdVrkYuy3Q2sRyMaFME3y99ngLrvDgZ4JAePEjFnmxj+ 1wBlrFQ4lZbENbI6s11Ka53rvcHjgtTdbRk3W3ZdxjKutDsfBBgp7FnIbVsh7Ps4/RjG YPY6eYge7TqR8aiCb/yufleh+mkUIAde2fA4YLnm+9mZZLPSSTtJIE0ahCCIx1Lmo5+R FHP+0UrNvqp9j0P914AZTTWcFWamdcMztiMtti57J9PJTbK31S+ZfPwEndjRlpRcH0XK IMsw== 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=fu944eOEvMKGLhYyTtaLxNv7CnU3CeKX3GpE57YABrM=; b=GNFi/khWeJczQ45hV5h4Z/uGcH5qlLHZSy1ZQmT2JauoWOnXgTL4RK8k1Tr9M9/ZYq 6mh/ySODqW1DHdnlHhRYd+OgUb9M12puONqze35JJdK7238NsNgeAJXcdgkXalI+k+DJ p72PYGc0hxT4JtXfB/vzVJtYx/fjuldutp0/y7x0ZONszh085VbUBFu+E4Zv40W89QEg 3ZHzawGH3dvAInzbxNoO4foYTZcVCcbSnbx9UMz+lebpJRqVyTL4lUuFempQLpmQ8Vqh sQgm6QxJymcl5akC3gIjkjTLDmyNN9fTdNo6Gfdp8apJUEQH8ufDesfkF7AO80Pmsvva ehRA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id w7si867365ljw.4.2018.03.07.08.45.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 08:45:03 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@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 claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w27Gj27c007283 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 7 Mar 2018 17:45:02 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.68.223]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w27Gj1eC025573; Wed, 7 Mar 2018 17:45:02 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v4 5/5] meta-isar/multiconfig: remove multistrap references Date: Wed, 7 Mar 2018 17:44:57 +0100 Message-Id: <20180307164457.31933-6-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180307164457.31933-1-claudius.heine.ext@siemens.com> References: <20180307164457.31933-1-claudius.heine.ext@siemens.com> X-TUID: XUfPzp/zZ9cV 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 | 8 -------- meta-isar/conf/distro/debian-stretch.conf | 8 -------- meta-isar/conf/distro/debian-wheezy.conf | 8 -------- meta-isar/conf/distro/raspbian-jessie.conf | 8 -------- meta-isar/conf/local.conf.sample | 4 ++-- meta-isar/conf/multiconfig/qemuarm-jessie.conf | 2 +- meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 2 +- meta-isar/conf/multiconfig/rpi-jessie.conf | 2 +- 8 files changed, 5 insertions(+), 37 deletions(-) diff --git a/meta-isar/conf/distro/debian-jessie.conf b/meta-isar/conf/distro/debian-jessie.conf index df27fd7..ea46be6 100644 --- a/meta-isar/conf/distro/debian-jessie.conf +++ b/meta-isar/conf/distro/debian-jessie.conf @@ -9,11 +9,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_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_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 13c4f94..99d1737 100644 --- a/meta-isar/conf/distro/debian-stretch.conf +++ b/meta-isar/conf/distro/debian-stretch.conf @@ -6,11 +6,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_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_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 2108f9b..5b2e936 100644 --- a/meta-isar/conf/distro/debian-wheezy.conf +++ b/meta-isar/conf/distro/debian-wheezy.conf @@ -7,11 +7,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_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_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 57d0e7d..72d6067 100644 --- a/meta-isar/conf/distro/raspbian-jessie.conf +++ b/meta-isar/conf/distro/raspbian-jessie.conf @@ -7,11 +7,3 @@ DISTRO_APT_SOURCES += "conf/distro/raspbian-jessie.list" DISTRO_APT_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" DISTRO_CONFIG_SCRIPT?= "raspbian-configscript.sh" DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv" - -# No longer needed: -DISTRO_SUITE ?= "jessie" -DISTRO_COMPONENTS ?= "main contrib non-free firmware" -DISTRO_APT_SOURCE ?= "http://archive.raspbian.org/raspbian" -DISTRO_APT_SOURCE_SEC ?= "" -DISTRO_MULTICONF_BOOTSTRAP ?= "base" -DISTRO_MULTICONF_APTSOURCES ?= "${DISTRO_MULTICONF_BOOTSTRAP}" diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 46bfae0..39875c1 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -23,10 +23,10 @@ MACHINE ??= "qemuarm" # # Multistrap Configuration Selection # -# You need to select a specific multistrap configuration which will used for both: +# You need to select a specific distribution configuration which will used for both: # generation of buildchroot environment and target root filesystem. # -# 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-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