[PATCH 1/6] meta-isar: Add bookworm config for de0-nano-soc

[PATCH 1/6] meta-isar: Add bookworm config for de0-nano-soc

[Srinuvasan Arjunan]

From: Srinuvasan A <srinuvasan.a@siemens.com>

Add bookworm config for de0-nano-soc target.

Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
 meta-isar/conf/local.conf.sample                      | 1 +
 meta-isar/conf/multiconfig/de0-nano-soc-bookworm.conf | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 meta-isar/conf/multiconfig/de0-nano-soc-bookworm.conf

diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 762709f..2451598 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -62,6 +62,7 @@ BBMULTICONFIG = " \
     bananapi-bullseye \
     de0-nano-soc-buster \
     de0-nano-soc-bullseye \
+    de0-nano-soc-bookworm \
     hikey-bullseye \
     hikey-bookworm \
     imx6-sabrelite-buster \
diff --git a/meta-isar/conf/multiconfig/de0-nano-soc-bookworm.conf b/meta-isar/conf/multiconfig/de0-nano-soc-bookworm.conf
new file mode 100644
index 0000000..15436aa
--- /dev/null
+++ b/meta-isar/conf/multiconfig/de0-nano-soc-bookworm.conf
@@ -0,0 +1,5 @@
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+MACHINE ?= "de0-nano-soc"
+DISTRO ?= "debian-bookworm"
-- 
2.34.1

[PATCH 2/6] meta-isar: Add bookworm config for bananapi

[Srinuvasan Arjunan]

From: Srinuvasan A <srinuvasan.a@siemens.com>

Add bookworm config for bananapi target.

Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
 meta-isar/conf/local.conf.sample                  | 1 +
 meta-isar/conf/multiconfig/bananapi-bookworm.conf | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 meta-isar/conf/multiconfig/bananapi-bookworm.conf

diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 2451598..52b53e5 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -60,6 +60,7 @@ BBMULTICONFIG = " \
     qemuriscv64-sid-ports \
     bananapi-buster \
     bananapi-bullseye \
+    bananapi-bookworm \
     de0-nano-soc-buster \
     de0-nano-soc-bullseye \
     de0-nano-soc-bookworm \
diff --git a/meta-isar/conf/multiconfig/bananapi-bookworm.conf b/meta-isar/conf/multiconfig/bananapi-bookworm.conf
new file mode 100644
index 0000000..2da5f6d
--- /dev/null
+++ b/meta-isar/conf/multiconfig/bananapi-bookworm.conf
@@ -0,0 +1,5 @@
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+MACHINE ?= "bananapi"
+DISTRO ?= "debian-bookworm"
-- 
2.34.1

[PATCH 3/6] meta-isar: Add bookworm config for nanopi-neo

[Srinuvasan Arjunan]

From: Srinuvasan A <srinuvasan.a@siemens.com>

Add bookworm config for nanopi-neo target.

Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
 meta-isar/conf/local.conf.sample                    | 1 +
 meta-isar/conf/multiconfig/nanopi-neo-bookworm.conf | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 meta-isar/conf/multiconfig/nanopi-neo-bookworm.conf

diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 52b53e5..aea66c2 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -71,6 +71,7 @@ BBMULTICONFIG = " \
     phyboard-mira-bullseye \
     nanopi-neo-buster \
     nanopi-neo-bullseye \
+    nanopi-neo-bookworm \
     stm32mp15x-bullseye \
     virtualbox-bullseye \
     rpi-arm-bullseye \
diff --git a/meta-isar/conf/multiconfig/nanopi-neo-bookworm.conf b/meta-isar/conf/multiconfig/nanopi-neo-bookworm.conf
new file mode 100644
index 0000000..f298c1b
--- /dev/null
+++ b/meta-isar/conf/multiconfig/nanopi-neo-bookworm.conf
@@ -0,0 +1,5 @@
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+MACHINE ?= "nanopi-neo"
+DISTRO ?= "debian-bookworm"
-- 
2.34.1

[PATCH 4/6] meta-isar: Add bookworm config for stm32mp15x

[Srinuvasan Arjunan]

From: Srinuvasan A <srinuvasan.a@siemens.com>

Add bookworm config for stm32mp15x target.

Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
 meta-isar/conf/local.conf.sample                    | 1 +
 meta-isar/conf/multiconfig/stm32mp15x-bookworm.conf | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 meta-isar/conf/multiconfig/stm32mp15x-bookworm.conf

diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index aea66c2..c62df16 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -73,6 +73,7 @@ BBMULTICONFIG = " \
     nanopi-neo-bullseye \
     nanopi-neo-bookworm \
     stm32mp15x-bullseye \
+    stm32mp15x-bookworm \
     virtualbox-bullseye \
     rpi-arm-bullseye \
     rpi-arm-v7-bullseye \
diff --git a/meta-isar/conf/multiconfig/stm32mp15x-bookworm.conf b/meta-isar/conf/multiconfig/stm32mp15x-bookworm.conf
new file mode 100644
index 0000000..0ada324
--- /dev/null
+++ b/meta-isar/conf/multiconfig/stm32mp15x-bookworm.conf
@@ -0,0 +1,5 @@
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+MACHINE ?= "stm32mp15x"
+DISTRO ?= "debian-bookworm"
-- 
2.34.1

[PATCH 5/6] meta-isar: Add bookworm config for imx6-sabrelite

[Srinuvasan Arjunan]

From: Srinuvasan A <srinuvasan.a@siemens.com>

Add bookworm config for imx6-sabrelite target.

Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
 meta-isar/conf/local.conf.sample                        | 1 +
 meta-isar/conf/multiconfig/imx6-sabrelite-bookworm.conf | 5 +++++
 meta-test/conf/local.conf.sample                        | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 meta-isar/conf/multiconfig/imx6-sabrelite-bookworm.conf

diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index c62df16..8116c4b 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -68,6 +68,7 @@ BBMULTICONFIG = " \
     hikey-bookworm \
     imx6-sabrelite-buster \
     imx6-sabrelite-bullseye \
+    imx6-sabrelite-bookworm \
     phyboard-mira-bullseye \
     nanopi-neo-buster \
     nanopi-neo-bullseye \
diff --git a/meta-isar/conf/multiconfig/imx6-sabrelite-bookworm.conf b/meta-isar/conf/multiconfig/imx6-sabrelite-bookworm.conf
new file mode 100644
index 0000000..fe69d3b
--- /dev/null
+++ b/meta-isar/conf/multiconfig/imx6-sabrelite-bookworm.conf
@@ -0,0 +1,5 @@
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+MACHINE ?= "imx6-sabrelite"
+DISTRO ?= "debian-bookworm"
diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample
index b705d3a..23e4ae1 100644
--- a/meta-test/conf/local.conf.sample
+++ b/meta-test/conf/local.conf.sample
@@ -36,6 +36,7 @@ BBMULTICONFIG = " \
     hikey-bookworm \
     imx6-sabrelite-buster \
     imx6-sabrelite-bullseye \
+    imx6-sabrelite-bookworm \
     phyboard-mira-bullseye \
     nanopi-neo-buster \
     nanopi-neo-bullseye \
-- 
2.34.1

Re: [PATCH 1/6] meta-isar: Add bookworm config for de0-nano-soc

[Uladzimir Bely]

On Tue, 2023-08-29 at 11:46 +0530, Srinuvasan Arjunan wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
> 
> Add bookworm config for de0-nano-soc target.
> 
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>

This one and the following patches demand on adding to the testsuite.

The only question is what would be better to do - just add them to
avocado tests (and increase total build time) or add them as a
replacement of corresponding "buster" targets (and deprecate buster
multiconfigs).

Re: [PATCH 1/6] meta-isar: Add bookworm config for de0-nano-soc

[Uladzimir Bely]

On Tue, 2023-08-29 at 11:46 +0530, Srinuvasan Arjunan wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
> 
> Add bookworm config for de0-nano-soc target.
> 
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
> ---
>  meta-isar/conf/local.conf.sample                      | 1 +
>  meta-isar/conf/multiconfig/de0-nano-soc-bookworm.conf | 5 +++++
>  2 files changed, 6 insertions(+)
>  create mode 100644 meta-isar/conf/multiconfig/de0-nano-soc-
> bookworm.conf
> 
> diff --git a/meta-isar/conf/local.conf.sample b/meta-
> isar/conf/local.conf.sample
> index 762709f..2451598 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -62,6 +62,7 @@ BBMULTICONFIG = " \
>      bananapi-bullseye \
>      de0-nano-soc-buster \
>      de0-nano-soc-bullseye \
> +    de0-nano-soc-bookworm \
>      hikey-bullseye \
>      hikey-bookworm \
>      imx6-sabrelite-buster \

This patch (and p2-p4) adds a new record to local.conf.sample only in
"meta-isar" layer. While p5-p6 do the same for both "meta-isar" and
"meta-test".

To avoid such kind of divergence in the future, now "meta-
isar/conf/mc.conf" is used as an only place to keep BBMULTICONFIG
variable, for both "meta-isar" and "meta-test" layers.

Also, p3 is not needed anymore since the nanopi bookworm multiconfig
was handled by other patchset.

> diff --git a/meta-isar/conf/multiconfig/de0-nano-soc-bookworm.conf
> b/meta-isar/conf/multiconfig/de0-nano-soc-bookworm.conf
> new file mode 100644
> index 0000000..15436aa
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/de0-nano-soc-bookworm.conf
> @@ -0,0 +1,5 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2023 ilbers GmbH
> +
> +MACHINE ?= "de0-nano-soc"
> +DISTRO ?= "debian-bookworm"
> -- 
> 2.34.1
>