diff mbox series

[isar-cip-core,v2,1/2] Drop stretch support

Message ID 20211216133617.3403412-2-Vijaikumar_Kanagarajan@mentor.com (mailing list archive)
State Handled Elsewhere
Headers show
Series Drop Stretch support | expand

Commit Message

Vijai Kumar K Dec. 16, 2021, 1:36 p.m. UTC 
The generic profile of CIP Core started its work with buster,
stretch was only experimental for this layer.

Remove the support now.

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 mbox series

Patch

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