From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
To: <cip-dev@lists.cip-project.org>, <jan.kiszka@siemens.com>
Cc: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
Subject: [isar-cip-core][PATCH 1/2] Drop stretch support
Date: Thu, 16 Dec 2021 18:34:49 +0530 [thread overview]
Message-ID: <20211216130450.3402865-2-Vijaikumar_Kanagarajan@mentor.com> (raw)
In-Reply-To: <20211216130450.3402865-1-Vijaikumar_Kanagarajan@mentor.com>
stretch is now old enough to be dropped. Support the current
stable(bullseye) and old-stable(buster).
Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
Kconfig | 4 ----
conf/distro/cip-core-stretch.conf | 16 ----------------
conf/machine/bbb.conf | 4 ----
kas/opt/stretch.yml | 15 ---------------
start-qemu.sh | 2 --
5 files changed, 41 deletions(-)
delete mode 100644 conf/distro/cip-core-stretch.conf
delete mode 100644 kas/opt/stretch.yml
diff --git a/Kconfig b/Kconfig
index e69293f..8032ede 100644
--- a/Kconfig
+++ b/Kconfig
@@ -82,9 +82,6 @@ choice
prompt "Debian Release"
default DEBIAN_BUSTER
-config DEBIAN_STRETCH
- bool "stretch (9)"
-
config DEBIAN_BUSTER
bool "buster (10)"
@@ -95,7 +92,6 @@ endchoice
config KAS_INCLUDE_DEBIAN
string
- default "kas/opt/stretch.yml" if DEBIAN_STRETCH
default "kas/opt/bullseye.yml" if DEBIAN_BULLSEYE
comment "Image features"
diff --git a/conf/distro/cip-core-stretch.conf b/conf/distro/cip-core-stretch.conf
deleted file mode 100644
index 31900fa..0000000
--- a/conf/distro/cip-core-stretch.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2019
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-require conf/distro/debian-stretch.conf
-require cip-core-common.inc
-
-PREFERRED_VERSION_linux-cip ?= "4.19.%"
-PREFERRED_VERSION_linux-cip-rt ?= "4.19.%"
diff --git a/conf/machine/bbb.conf b/conf/machine/bbb.conf
index a9b460e..6d8facb 100644
--- a/conf/machine/bbb.conf
+++ b/conf/machine/bbb.conf
@@ -11,8 +11,4 @@ DISTRO_ARCH = "armhf"
IMAGE_TYPE ?= "wic-img"
IMAGER_INSTALL += "u-boot-omap"
-# On stretch, select U-Boot from buster which comes with distro-boot support
-DISTRO_APT_SOURCES_append_cip-core-stretch = " conf/distro/debian-buster.list"
-DISTRO_APT_PREFERENCES_cip-core-stretch += "conf/machine/preferences.bbb.conf"
-
IMAGE_INSTALL += "u-boot-script"
diff --git a/kas/opt/stretch.yml b/kas/opt/stretch.yml
deleted file mode 100644
index 8e854c2..0000000
--- a/kas/opt/stretch.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2019
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-header:
- version: 10
-
-distro: cip-core-stretch
diff --git a/start-qemu.sh b/start-qemu.sh
index 4ab3861..489e0e0 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -33,8 +33,6 @@ fi
if [ -z "${DISTRO_RELEASE}" ]; then
if grep -s -q "DEBIAN_BULLSEYE: true" .config.yaml; then
DISTRO_RELEASE="bullseye"
- elif grep -s -q "DEBIAN_STRETCH: true" .config.yaml; then
- DISTRO_RELEASE="stretch"
else
DISTRO_RELEASE="buster"
fi
--
2.25.1
next prev parent reply other threads:[~2021-12-16 13:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 13:04 [isar-cip-core][PATCH 0/2] Drop Stretch support Vijai Kumar K
2021-12-16 13:04 ` Vijai Kumar K [this message]
2021-12-16 13:23 ` [isar-cip-core][PATCH 1/2] Drop stretch support Jan Kiszka
2021-12-16 13:25 ` Kanagarajan, Vijaikumar
2021-12-16 13:04 ` [isar-cip-core][PATCH 2/2] swupdate: Drop conditional includes for buster Vijai Kumar K
2021-12-16 13:10 ` [cip-dev] " Gylstorff Quirin
2021-12-16 13:20 ` Kanagarajan, Vijaikumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211216130450.3402865-2-Vijaikumar_Kanagarajan@mentor.com \
--to=vijaikumar_kanagarajan@mentor.com \
--cc=cip-dev@lists.cip-project.org \
--cc=jan.kiszka@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.