From patchwork Thu Dec 16 13:04:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 12681123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 526E5C433FE for ; Thu, 16 Dec 2021 13:05:16 +0000 (UTC) Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by mx.groups.io with SMTP id smtpd.web11.10264.1639659913028134020 for ; Thu, 16 Dec 2021 05:05:15 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: mentor.com, ip: 68.232.137.252, mailfrom: vijaikumar_kanagarajan@mentor.com) IronPort-SDR: iVJL8QgMwNAy6X8MJbsPbeSQKng7s/12Hx39L0wy4Q8Vjxf73EhN1CQI6/SGX3H7tLnafc2AOu aDL0hD6eo9Na6miAgEYEDFiB+zHZ96xoEsrA+0Dhs0QeHSOToOUHtcrNee7VtHeSE0epuO2nzd aQeTUfF7Be9/19JblG3OUszRn5a1l179A69FXIYcHxnAcODY/BCgJBVNxTdWiQodULhuIXqN3G Hcg6kdHq9ZyOydrTKMOikYHlPZvmqTAChj5Ea7S19LKp2NlsGctwCgIY6/D4XXRUZqkehMyIel PuYUN2JHLR7M7MS5cKweffKx X-IronPort-AV: E=Sophos;i="5.88,211,1635235200"; d="scan'208";a="69782850" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 16 Dec 2021 05:05:14 -0800 IronPort-SDR: VL7X3gxNbuOy1PqUIiNNBsZZ2o3NBdksvcOQivpsjr4rSZyImpue/FBpPmyUirwyadOXINJqkP MqnVv1wVyangW7PzrCNAVlfvAH7o7oh5wsLI8TY0dKFhG3hhHHuoEUobkKP8fWHrm+hnXnd0vK LzmBNAeZbG+SOXJkyqmolhMg92W4YtETZJbnZAYQveKd/0okUKn3sFUQ6QT3ZRk82P8FjIdgru wRWrJW2+OLbM/+tDewm5ex6MClUplEv0qDph4GFD8DsKaSCxM0CFdRSn9DBmqbUxphOCapNlfb QXY= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [isar-cip-core][PATCH 1/2] Drop stretch support Date: Thu, 16 Dec 2021 18:34:49 +0530 Message-ID: <20211216130450.3402865-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211216130450.3402865-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211216130450.3402865-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 Dec 2021 13:05:16 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7149 stretch is now old enough to be dropped. Support the current stable(bullseye) and old-stable(buster). Signed-off-by: Vijai Kumar K --- 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 -# -# 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 -# -# 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 From patchwork Thu Dec 16 13:04:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 12681125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38C9CC433EF for ; Thu, 16 Dec 2021 13:05:19 +0000 (UTC) Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by mx.groups.io with SMTP id smtpd.web11.10264.1639659913028134020 for ; Thu, 16 Dec 2021 05:05:18 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: mentor.com, ip: 68.232.137.252, mailfrom: vijaikumar_kanagarajan@mentor.com) IronPort-SDR: CS4PMezpWgJSvOgxbniJ7t4Jv0eosWJtuI7DbKmQ3pJiLrlogIwXR14OYmimE0qnd49GaA0MWx dVaqOu5vPrjKXDX/xotClSUopATcos/OE3Q9sr3pmFuZiWWN/0pPFgBr3EdwZIvU4dbAnjcedl ANLP8rV3LPkTps/IJaFw904inFV3MKHM9r7iYsehc3jxECquc6u/3Oycr0LpvAfvApBlQ5cOtm F/E2wrWwkdYwEvtQUijwp7STCkbgoPv7BkayMQmoRwZrWRwsukMdkVdgAeyAfu2VKPzLHVApAG KRFuvb9Pi1fSGAOTsujN4rd8 X-IronPort-AV: E=Sophos;i="5.88,211,1635235200"; d="scan'208";a="69782862" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 16 Dec 2021 05:05:17 -0800 IronPort-SDR: ezQ4y+Hsa2fDrMVaAIYnviCbRxdM2JZyK8O+9x387Q4C/DKNmdEHYlDR+0ltMsVSzpXbPGaZba eJxhf1ATiblPx998EhSAxIn//XI6JCiceGYPT5/UDS40necYmcI0jCs5LgeThIJ3p9RLtIGjDZ fepaZypsyT3xmkYgf7f76tOr6VNhTpenaWpJGsEbMjJ3ySUEA36wLSC7NJhPjCekzx7c6VpigU Ho/07E1rvu1g5z65MEzNk/00AZ/i6dC7Wmb1bpj5wmgzT0kn9oDrlUUqBLkx6dXlWaoE7EqQag 9M0= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [isar-cip-core][PATCH 2/2] swupdate: Drop conditional includes for buster Date: Thu, 16 Dec 2021 18:34:50 +0530 Message-ID: <20211216130450.3402865-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211216130450.3402865-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211216130450.3402865-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 Dec 2021 13:05:19 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7150 Stretch in now dropped. The conditional includes for buster is now not needed. Those includes are applicable to buster as well as bullseye. Signed-off-by: Vijai Kumar K --- .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb index a4d67fe..826982a 100644 --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb @@ -23,7 +23,8 @@ SRC_URI += "file://0001-debian-Add-option-to-build-with-efibootguard.patch \ file://0005-debian-rules-Add-option-to-disable-fs-creation.patch \ file://0006-debian-rules-Add-option-to-disable-webserver.patch \ file://0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch \ - file://0008-debian-rules-Add-Embedded-Lua-handler-option.patch" + file://0008-debian-rules-Add-Embedded-Lua-handler-option.patch \ + file://0009-debian-prepare-build-for-isar-debian-buster.patch" # Patch for dm-verity based images - can be removed with next SWUpdate release SRC_URI += "file://0001-debian-patches-add-patches-for-dm-verity.patch" @@ -41,15 +42,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck" # GBP_DEPENDS += "swupdate-handlers" # SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua" -# modify for debian buster build -SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch" - -# disable documentation due to missing packages in debian buster -# disable create filesystem due to missing symbols in debian buster -# disable webserver due to missing symbols in debian buster -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \ - pkg.swupdate.nocreatefs \ - pkg.swupdate.nowebserver " +# disable documentation due to missing packages +# disable create filesystem due to missing symbols +# disable webserver due to missing symbols +SWUPDATE_BUILD_PROFILES_append = " nodoc \ + pkg.swupdate.nocreatefs \ + pkg.swupdate.nowebserver " # In debian buster the git-compression defaults to gz and does not detect other # compression formats. GBP_EXTRA_OPTIONS += "--git-compression=xz"