[1/2] add nanopi-neo-bookworm target

Message ID 20230914074226.3018960-2-felix.moessbauer@siemens.com
State Superseded, archived
Headers show
Series add bookworm versions of nanopi-neo | expand

Commit Message

MOESSBAUER, Felix Sept. 14, 2023, 7:42 a.m. UTC
This target is based on the classical u-boot boot chain to
allow easy use of device tree overlays.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta-isar/conf/multiconfig/nanopi-neo-bookworm.conf | 5 +++++
 testsuite/citest.py                                 | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 meta-isar/conf/multiconfig/nanopi-neo-bookworm.conf

Comments

Uladzimir Bely Sept. 20, 2023, 8:42 a.m. UTC | #1
On Thu, 2023-09-14 at 07:42 +0000, 'Felix Moessbauer' via isar-users
wrote:
> This target is based on the classical u-boot boot chain to
> allow easy use of device tree overlays.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta-isar/conf/multiconfig/nanopi-neo-bookworm.conf | 5 +++++
>  testsuite/citest.py                                 | 1 +
>  2 files changed, 6 insertions(+)
>  create mode 100644 meta-isar/conf/multiconfig/nanopi-neo-
> bookworm.conf
> 
> 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 00000000..e11bf37e
> --- /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 Siemens AG
> +
> +MACHINE ?= "nanopi-neo"
> +DISTRO ?= "debian-bookworm"
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index 48b10286..73dddaf3 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -197,6 +197,7 @@ class NoCrossTest(CIBaseTest):
>              'mc:virtualbox-bullseye:isar-image-base',
>              'mc:bananapi-bullseye:isar-image-base',
>              'mc:nanopi-neo-bullseye:isar-image-base',
> +            'mc:nanopi-neo-bookworm:isar-image-base',
>              'mc:stm32mp15x-bullseye:isar-image-base',
>              'mc:qemuamd64-focal:isar-image-ci',
>              'mc:qemuamd64-bookworm:isar-image-ci',
> -- 
> 2.34.1
> 

New multiconfig records should also be added to local.conf.sample,
otherwise CI fails with:
"ERROR: Multiconfig dependency mc:nanopi-neo-efi-bookworm:isar-image-
base depends on nonexistent multiconfig configuration named nanopi-neo-
efi-bookworm"

By the way, we now have different "local.conf.sample" files in both
"meta-isar" and "meta-test" layers and should think about possibility
of reusing the code in them...


Patch

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 00000000..e11bf37e
--- /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 Siemens AG
+
+MACHINE ?= "nanopi-neo"
+DISTRO ?= "debian-bookworm"
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 48b10286..73dddaf3 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -197,6 +197,7 @@  class NoCrossTest(CIBaseTest):
             'mc:virtualbox-bullseye:isar-image-base',
             'mc:bananapi-bullseye:isar-image-base',
             'mc:nanopi-neo-bullseye:isar-image-base',
+            'mc:nanopi-neo-bookworm:isar-image-base',
             'mc:stm32mp15x-bullseye:isar-image-base',
             'mc:qemuamd64-focal:isar-image-ci',
             'mc:qemuamd64-bookworm:isar-image-ci',