[PATCH] Drop stm32mp15x-buster multiconfig

[PATCH] Drop stm32mp15x-buster multiconfig

[Uladzimir Bely]

New optee related features are not easily supported under buster and
building stm32mp15x target for it without additional patches fail.
This leads to failing CI.

Remove mc:stm32mp15x-buster multiconfig and related code since it is
not worth the effort to fix.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---

The patch to apply with "Add optee family and friends" series.

 meta-isar/conf/local.conf.sample                  | 1 -
 meta-isar/conf/multiconfig/stm32mp15x-buster.conf | 7 -------
 meta-test/conf/local.conf.sample                  | 1 -
 testsuite/citest.py                               | 2 +-
 4 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 meta-isar/conf/multiconfig/stm32mp15x-buster.conf

diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 910b0a43..762709f4 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -69,7 +69,6 @@ BBMULTICONFIG = " \
     phyboard-mira-bullseye \
     nanopi-neo-buster \
     nanopi-neo-bullseye \
-    stm32mp15x-buster \
     stm32mp15x-bullseye \
     virtualbox-bullseye \
     rpi-arm-bullseye \
diff --git a/meta-isar/conf/multiconfig/stm32mp15x-buster.conf b/meta-isar/conf/multiconfig/stm32mp15x-buster.conf
deleted file mode 100644
index 01caf876..00000000
--- a/meta-isar/conf/multiconfig/stm32mp15x-buster.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) Siemens AG, 2020
-#
-# SPDX-License-Identifier: MIT
-
-MACHINE ?= "stm32mp15x"
-DISTRO ?= "debian-buster"
diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample
index fb962d96..b705d3a8 100644
--- a/meta-test/conf/local.conf.sample
+++ b/meta-test/conf/local.conf.sample
@@ -39,7 +39,6 @@ BBMULTICONFIG = " \
     phyboard-mira-bullseye \
     nanopi-neo-buster \
     nanopi-neo-bullseye \
-    stm32mp15x-buster \
     stm32mp15x-bullseye \
     virtualbox-bullseye \
     rpi-arm-bullseye \
diff --git a/testsuite/citest.py b/testsuite/citest.py
index f867cb94..b81d86f9 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -127,7 +127,7 @@ class CrossTest(CIBaseTest):
             'mc:qemuarm-buster:isar-image-ci',
             'mc:qemuarm-bullseye:isar-image-ci',
             'mc:de0-nano-soc-bullseye:isar-image-base',
-            'mc:stm32mp15x-buster:isar-image-base'
+            'mc:stm32mp15x-bullseye:isar-image-base'
                   ]
 
         self.init()
-- 
2.20.1

Re: [PATCH] Drop stm32mp15x-buster multiconfig

[Uladzimir Bely]

On Fri, 2023-07-07 at 05:02 +0200, Uladzimir Bely wrote:
> New optee related features are not easily supported under buster and
> building stm32mp15x target for it without additional patches fail.
> This leads to failing CI.
> 
> Remove mc:stm32mp15x-buster multiconfig and related code since it is
> not worth the effort to fix.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
> 
> The patch to apply with "Add optee family and friends" series.
> 
>  meta-isar/conf/local.conf.sample                  | 1 -
>  meta-isar/conf/multiconfig/stm32mp15x-buster.conf | 7 -------
>  meta-test/conf/local.conf.sample                  | 1 -
>  testsuite/citest.py                               | 2 +-
>  4 files changed, 1 insertion(+), 10 deletions(-)
>  delete mode 100644 meta-isar/conf/multiconfig/stm32mp15x-buster.conf
> 
> diff --git a/meta-isar/conf/local.conf.sample b/meta-
> isar/conf/local.conf.sample
> index 910b0a43..762709f4 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -69,7 +69,6 @@ BBMULTICONFIG = " \
>      phyboard-mira-bullseye \
>      nanopi-neo-buster \
>      nanopi-neo-bullseye \
> -    stm32mp15x-buster \
>      stm32mp15x-bullseye \
>      virtualbox-bullseye \
>      rpi-arm-bullseye \
> diff --git a/meta-isar/conf/multiconfig/stm32mp15x-buster.conf
> b/meta-isar/conf/multiconfig/stm32mp15x-buster.conf
> deleted file mode 100644
> index 01caf876..00000000
> --- a/meta-isar/conf/multiconfig/stm32mp15x-buster.conf
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -#
> -# Copyright (c) Siemens AG, 2020
> -#
> -# SPDX-License-Identifier: MIT
> -
> -MACHINE ?= "stm32mp15x"
> -DISTRO ?= "debian-buster"
> diff --git a/meta-test/conf/local.conf.sample b/meta-
> test/conf/local.conf.sample
> index fb962d96..b705d3a8 100644
> --- a/meta-test/conf/local.conf.sample
> +++ b/meta-test/conf/local.conf.sample
> @@ -39,7 +39,6 @@ BBMULTICONFIG = " \
>      phyboard-mira-bullseye \
>      nanopi-neo-buster \
>      nanopi-neo-bullseye \
> -    stm32mp15x-buster \
>      stm32mp15x-bullseye \
>      virtualbox-bullseye \
>      rpi-arm-bullseye \
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index f867cb94..b81d86f9 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -127,7 +127,7 @@ class CrossTest(CIBaseTest):
>              'mc:qemuarm-buster:isar-image-ci',
>              'mc:qemuarm-bullseye:isar-image-ci',
>              'mc:de0-nano-soc-bullseye:isar-image-base',
> -            'mc:stm32mp15x-buster:isar-image-base'
> +            'mc:stm32mp15x-bullseye:isar-image-base'
>                    ]
>  
>          self.init()
> -- 
> 2.20.1
> 

Applied to next.