[isar-cip-core][PATCH 1/3] ebg: install for correct distro-arch

[isar-cip-core][PATCH 1/3] ebg: install for correct distro-arch

[Felix Moessbauer]

The efibootguard package is architecture specific (similar to the
systemd-boot package). Hence, install it for the distro-arch, not for
the host arch to make cross-imaging work.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 recipes-core/images/efibootguard.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/images/efibootguard.inc b/recipes-core/images/efibootguard.inc
index 26026dc..b3fe911 100644
--- a/recipes-core/images/efibootguard.inc
+++ b/recipes-core/images/efibootguard.inc
@@ -11,7 +11,7 @@
 
 IMAGE_INSTALL:append = " efibootguard"
 
-WIC_IMAGER_INSTALL:append = " efibootguard"
+WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
 WDOG_TIMEOUT ?= "60"
 WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES"
 IMAGE_FSTYPES += "wic"
-- 
2.34.1

[isar-cip-core][PATCH 2/3] fix efibootguard for riscv64

[Felix Moessbauer]

This commit backports an upstream patch for efibootguard that
fixes the riscv64 install location. As it is not yet in an
EBG release, we add it as a patch here. No internal logic of EBG is
changed, hence no dedicated release is needed.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 recipes-bsp/efibootguard/efibootguard_0.13.bb |  3 ++
 ...01-add-machine-type-name-for-riscv64.patch | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch

diff --git a/recipes-bsp/efibootguard/efibootguard_0.13.bb b/recipes-bsp/efibootguard/efibootguard_0.13.bb
index 3279854..d6101df 100644
--- a/recipes-bsp/efibootguard/efibootguard_0.13.bb
+++ b/recipes-bsp/efibootguard/efibootguard_0.13.bb
@@ -21,6 +21,9 @@ SRC_URI = " \
     file://debian \
     "
 SRC_URI[sha256sum] = "639a6d8f687cb099b2e9b01eb08ad1494267fe26b5d903b4d405d0737feb989b"
+# add riscv64 support
+SRC_URI += "file://0001-add-machine-type-name-for-riscv64.patch"
+CHANGELOG_V = "<orig-version>+cip"
 
 PROVIDES = "${PN}"
 PROVIDES += "${PN}-dev"
diff --git a/recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch b/recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch
new file mode 100644
index 0000000..adc7962
--- /dev/null
+++ b/recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch
@@ -0,0 +1,39 @@
+From 391dd5e04b17be6f5184afb2de4853795f1d5620 Mon Sep 17 00:00:00 2001
+From: Felix Moessbauer <felix.moessbauer@siemens.com>
+Date: Tue, 31 Jan 2023 09:27:31 +0100
+Subject: [PATCH 1/1] add machine type name for riscv64
+
+By adding the machine type name, the generated efi binary for
+riscv64 is suffixed with the corresponding efi machine name.
+
+Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
+Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
+---
+ configure.ac | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index d8f9d3a..90d70b0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -87,6 +87,7 @@ SET_ARCH(X86_64, x86_64*)
+ SET_ARCH(IA64, ia64*)
+ SET_ARCH(AARCH64, aarch64*)
+ SET_ARCH(ARM, arm*)
++SET_ARCH(RISCV64, riscv64*)
+ 
+ ARCH=$(echo $host | sed "s/\(-\).*$//")
+ 
+@@ -103,6 +104,9 @@ AM_COND_IF(ARCH_AARCH64, [
+ AM_COND_IF(ARCH_ARM, [
+ 	   MACHINE_TYPE_NAME=arm])
+ 
++AM_COND_IF(ARCH_RISCV64, [
++	   MACHINE_TYPE_NAME=riscv64])
++
+ AC_SUBST([ARCH])
+ AC_SUBST([MACHINE_TYPE_NAME])
+ AM_CONDITIONAL([ARCH_IS_X86], [test "$ARCH" = "ia32" -o "$ARCH" = "x86_64"])
+-- 
+2.30.2
+
-- 
2.34.1

[isar-cip-core][PATCH 3/3] wic(ebg): add support for riscv64

[Felix Moessbauer]

This patch adds the mapping between the efi architecture and the distro
architecture for riscv64.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 scripts/lib/wic/plugins/source/efibootguard-boot.py | 6 ++++--
 scripts/lib/wic/plugins/source/efibootguard-efi.py  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py b/scripts/lib/wic/plugins/source/efibootguard-boot.py
index 3d6b2d7..0de28ca 100644
--- a/scripts/lib/wic/plugins/source/efibootguard-boot.py
+++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py
@@ -185,13 +185,15 @@ class EfibootguardBootPlugin(SourcePlugin):
             "amd64": "x64",
             "arm64": "aa64",
             "armhf": "arm",
-            "i386": "ia32"
+            "i386": "ia32",
+            "riscv64" : "riscv64"
         }
         distro_to_lib_arch = {
             "amd64": "x86_64-linux-gnu",
             "arm64": "aarch64-linux-gnu",
             "armhf": "arm-linux-gnueabihf",
-            "i386": "i386-linux-gnu"
+            "i386": "i386-linux-gnu",
+            "riscv64": "riscv64-linux-gnu",
         }
         rootfs_path = rootfs_dir.get('ROOTFS_DIR')
         distro_arch = get_bitbake_var("DISTRO_ARCH")
diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py
index 2d16fe3..d6cdf0f 100644
--- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
+++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
@@ -56,14 +56,16 @@ class EfibootguardEFIPlugin(SourcePlugin):
             "amd64": "x64",
             "arm64": "aa64",
             "armhf": "arm",
-            "i386": "ia32"
+            "i386": "ia32",
+            "riscv64" : "riscv64"
         }
 
         distro_to_lib_arch = {
             "amd64": "x86_64-linux-gnu",
             "arm64": "aarch64-linux-gnu",
             "armhf": "arm-linux-gnueabihf",
-            "i386": "i386-linux-gnu"
+            "i386": "i386-linux-gnu",
+            "riscv64": "riscv64-linux-gnu",
         }
 
         distro_arch = get_bitbake_var("DISTRO_ARCH")
-- 
2.34.1

Re: [isar-cip-core][PATCH 1/3] ebg: install for correct distro-arch

[Jan Kiszka]

On 13.02.23 09:57, Felix Moessbauer wrote:
> The efibootguard package is architecture specific (similar to the
> systemd-boot package). Hence, install it for the distro-arch, not for
> the host arch to make cross-imaging work.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  recipes-core/images/efibootguard.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-core/images/efibootguard.inc b/recipes-core/images/efibootguard.inc
> index 26026dc..b3fe911 100644
> --- a/recipes-core/images/efibootguard.inc
> +++ b/recipes-core/images/efibootguard.inc
> @@ -11,7 +11,7 @@
>  
>  IMAGE_INSTALL:append = " efibootguard"
>  
> -WIC_IMAGER_INSTALL:append = " efibootguard"
> +WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
>  WDOG_TIMEOUT ?= "60"
>  WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES"
>  IMAGE_FSTYPES += "wic"

When does this bite us? Current master is not affected as it seems.
Bookworm/sid, when all efibootguard archs are available at the same time?

In any case, another regression from the switch to buildchroot-host in
isar. I had fallouts from that as well, and they are all subtle to
debug. Must be documented in upstream's RECIPE-API-CHANGLOG, with all
its aspects - please fix (you caused it in the first place ;) ).

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [isar-cip-core][PATCH 1/3] ebg: install for correct distro-arch

[Moessbauer, Felix]

On Mon, 2023-02-13 at 12:29 +0100, Jan Kiszka wrote:
> On 13.02.23 09:57, Felix Moessbauer wrote:
> > The efibootguard package is architecture specific (similar to the
> > systemd-boot package). Hence, install it for the distro-arch, not
> > for
> > the host arch to make cross-imaging work.
> > 
> > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> > ---
> >  recipes-core/images/efibootguard.inc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/recipes-core/images/efibootguard.inc b/recipes-
> > core/images/efibootguard.inc
> > index 26026dc..b3fe911 100644
> > --- a/recipes-core/images/efibootguard.inc
> > +++ b/recipes-core/images/efibootguard.inc
> > @@ -11,7 +11,7 @@
> >  
> >  IMAGE_INSTALL:append = " efibootguard"
> >  
> > -WIC_IMAGER_INSTALL:append = " efibootguard"
> > +WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
> >  WDOG_TIMEOUT ?= "60"
> >  WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES"
> >  IMAGE_FSTYPES += "wic"
> 
> When does this bite us? Current master is not affected as it seems.
> Bookworm/sid, when all efibootguard archs are available at the same
> time?

Yes, exactly. When we build it manually, only the "correct" package is
added to the isar-apt (because there is no other).

> 
> In any case, another regression from the switch to buildchroot-host
> in
> isar. I had fallouts from that as well, and they are all subtle to
> debug. Must be documented in upstream's RECIPE-API-CHANGLOG, with all
> its aspects - please fix (you caused it in the first place ;) ).

Well... in my opinion this is not a regression but just a bug that
shows up because we "cross-image". But yes, that doesn't help our users
much. I'll add a changelog entry.

Felix

> 
> Jan
> 

Re: [isar-cip-core][PATCH 1/3] ebg: install for correct distro-arch

[Jan Kiszka]

On 13.02.23 13:09, Moessbauer, Felix (T CED INW-CN) wrote:
> On Mon, 2023-02-13 at 12:29 +0100, Jan Kiszka wrote:
>> On 13.02.23 09:57, Felix Moessbauer wrote:
>>> The efibootguard package is architecture specific (similar to the
>>> systemd-boot package). Hence, install it for the distro-arch, not
>>> for
>>> the host arch to make cross-imaging work.
>>>
>>> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
>>> ---
>>>  recipes-core/images/efibootguard.inc | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/recipes-core/images/efibootguard.inc b/recipes-
>>> core/images/efibootguard.inc
>>> index 26026dc..b3fe911 100644
>>> --- a/recipes-core/images/efibootguard.inc
>>> +++ b/recipes-core/images/efibootguard.inc
>>> @@ -11,7 +11,7 @@
>>>
>>>  IMAGE_INSTALL:append = " efibootguard"
>>>
>>> -WIC_IMAGER_INSTALL:append = " efibootguard"
>>> +WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
>>>  WDOG_TIMEOUT ?= "60"
>>>  WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES"
>>>  IMAGE_FSTYPES += "wic"
>>
>> When does this bite us? Current master is not affected as it seems.
>> Bookworm/sid, when all efibootguard archs are available at the same
>> time?
> 
> Yes, exactly. When we build it manually, only the "correct" package is
> added to the isar-apt (because there is no other).
> 
>>
>> In any case, another regression from the switch to buildchroot-host
>> in
>> isar. I had fallouts from that as well, and they are all subtle to
>> debug. Must be documented in upstream's RECIPE-API-CHANGLOG, with all
>> its aspects - please fix (you caused it in the first place ;) ).
> 
> Well... in my opinion this is not a regression but just a bug that
> shows up because we "cross-image". But yes, that doesn't help our users
> much. I'll add a changelog entry.

The original imager was built around the assumption that it runs as if
it was on the target - hence buildchroot-target. That was changed, and
it hopefully will never trigger any problems with Debian bootloader
packagings themself. So far, it only requires downstream recipes to
account for this new boundary condition. Thus, it broke the recipe API.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [isar-cip-core][PATCH 3/3] wic(ebg): add support for riscv64

[Jan Kiszka]

On 13.02.23 09:57, Felix Moessbauer wrote:
> This patch adds the mapping between the efi architecture and the distro
> architecture for riscv64.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  scripts/lib/wic/plugins/source/efibootguard-boot.py | 6 ++++--
>  scripts/lib/wic/plugins/source/efibootguard-efi.py  | 6 ++++--
>  2 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py b/scripts/lib/wic/plugins/source/efibootguard-boot.py
> index 3d6b2d7..0de28ca 100644
> --- a/scripts/lib/wic/plugins/source/efibootguard-boot.py
> +++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py
> @@ -185,13 +185,15 @@ class EfibootguardBootPlugin(SourcePlugin):
>              "amd64": "x64",
>              "arm64": "aa64",
>              "armhf": "arm",
> -            "i386": "ia32"
> +            "i386": "ia32",
> +            "riscv64" : "riscv64"
>          }
>          distro_to_lib_arch = {
>              "amd64": "x86_64-linux-gnu",
>              "arm64": "aarch64-linux-gnu",
>              "armhf": "arm-linux-gnueabihf",
> -            "i386": "i386-linux-gnu"
> +            "i386": "i386-linux-gnu",
> +            "riscv64": "riscv64-linux-gnu",
>          }
>          rootfs_path = rootfs_dir.get('ROOTFS_DIR')
>          distro_arch = get_bitbake_var("DISTRO_ARCH")
> diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py
> index 2d16fe3..d6cdf0f 100644
> --- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
> +++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
> @@ -56,14 +56,16 @@ class EfibootguardEFIPlugin(SourcePlugin):
>              "amd64": "x64",
>              "arm64": "aa64",
>              "armhf": "arm",
> -            "i386": "ia32"
> +            "i386": "ia32",
> +            "riscv64" : "riscv64"
>          }
>  
>          distro_to_lib_arch = {
>              "amd64": "x86_64-linux-gnu",
>              "arm64": "aarch64-linux-gnu",
>              "armhf": "arm-linux-gnueabihf",
> -            "i386": "i386-linux-gnu"
> +            "i386": "i386-linux-gnu",
> +            "riscv64": "riscv64-linux-gnu",
>          }
>  
>          distro_arch = get_bitbake_var("DISTRO_ARCH")

Now, does the swupdate image work with that already? Can we enabled it
in Kconfig then? Or are there more changes still needed?

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [isar-cip-core][PATCH 1/3] ebg: install for correct distro-arch

[Jan Kiszka]

On 13.02.23 15:43, Jan Kiszka wrote:
> On 13.02.23 13:09, Moessbauer, Felix (T CED INW-CN) wrote:
>> On Mon, 2023-02-13 at 12:29 +0100, Jan Kiszka wrote:
>>> On 13.02.23 09:57, Felix Moessbauer wrote:
>>>> The efibootguard package is architecture specific (similar to the
>>>> systemd-boot package). Hence, install it for the distro-arch, not
>>>> for
>>>> the host arch to make cross-imaging work.
>>>>
>>>> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
>>>> ---
>>>>  recipes-core/images/efibootguard.inc | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/recipes-core/images/efibootguard.inc b/recipes-
>>>> core/images/efibootguard.inc
>>>> index 26026dc..b3fe911 100644
>>>> --- a/recipes-core/images/efibootguard.inc
>>>> +++ b/recipes-core/images/efibootguard.inc
>>>> @@ -11,7 +11,7 @@
>>>>
>>>>  IMAGE_INSTALL:append = " efibootguard"
>>>>
>>>> -WIC_IMAGER_INSTALL:append = " efibootguard"
>>>> +WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
>>>>  WDOG_TIMEOUT ?= "60"
>>>>  WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES"
>>>>  IMAGE_FSTYPES += "wic"
>>>
>>> When does this bite us? Current master is not affected as it seems.
>>> Bookworm/sid, when all efibootguard archs are available at the same
>>> time?
>>
>> Yes, exactly. When we build it manually, only the "correct" package is
>> added to the isar-apt (because there is no other).
>>
>>>
>>> In any case, another regression from the switch to buildchroot-host
>>> in
>>> isar. I had fallouts from that as well, and they are all subtle to
>>> debug. Must be documented in upstream's RECIPE-API-CHANGLOG, with all
>>> its aspects - please fix (you caused it in the first place ;) ).
>>
>> Well... in my opinion this is not a regression but just a bug that
>> shows up because we "cross-image". But yes, that doesn't help our users
>> much. I'll add a changelog entry.
> 
> The original imager was built around the assumption that it runs as if
> it was on the target - hence buildchroot-target. That was changed, and
> it hopefully will never trigger any problems with Debian bootloader
> packagings themself. So far, it only requires downstream recipes to
> account for this new boundary condition. Thus, it broke the recipe API.
> 
> Jan
> 

That said, I've picked this as fix into next already. The rest still
needs clarification for me.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [isar-cip-core][PATCH 3/3] wic(ebg): add support for riscv64

[Moessbauer, Felix]

On Mon, 2023-02-13 at 15:45 +0100, Jan Kiszka wrote:
> On 13.02.23 09:57, Felix Moessbauer wrote:
> > This patch adds the mapping between the efi architecture and the
> > distro
> > architecture for riscv64.
> > 
> > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> > ---
> >  scripts/lib/wic/plugins/source/efibootguard-boot.py | 6 ++++--
> >  scripts/lib/wic/plugins/source/efibootguard-efi.py  | 6 ++++--
> >  2 files changed, 8 insertions(+), 4 deletions(-)
> > 
> > diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py
> > b/scripts/lib/wic/plugins/source/efibootguard-boot.py
> > index 3d6b2d7..0de28ca 100644
> > --- a/scripts/lib/wic/plugins/source/efibootguard-boot.py
> > +++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py
> > @@ -185,13 +185,15 @@ class EfibootguardBootPlugin(SourcePlugin):
> >              "amd64": "x64",
> >              "arm64": "aa64",
> >              "armhf": "arm",
> > -            "i386": "ia32"
> > +            "i386": "ia32",
> > +            "riscv64" : "riscv64"
> >          }
> >          distro_to_lib_arch = {
> >              "amd64": "x86_64-linux-gnu",
> >              "arm64": "aarch64-linux-gnu",
> >              "armhf": "arm-linux-gnueabihf",
> > -            "i386": "i386-linux-gnu"
> > +            "i386": "i386-linux-gnu",
> > +            "riscv64": "riscv64-linux-gnu",
> >          }
> >          rootfs_path = rootfs_dir.get('ROOTFS_DIR')
> >          distro_arch = get_bitbake_var("DISTRO_ARCH")
> > diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py
> > b/scripts/lib/wic/plugins/source/efibootguard-efi.py
> > index 2d16fe3..d6cdf0f 100644
> > --- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
> > +++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
> > @@ -56,14 +56,16 @@ class EfibootguardEFIPlugin(SourcePlugin):
> >              "amd64": "x64",
> >              "arm64": "aa64",
> >              "armhf": "arm",
> > -            "i386": "ia32"
> > +            "i386": "ia32",
> > +            "riscv64" : "riscv64"
> >          }
> >  
> >          distro_to_lib_arch = {
> >              "amd64": "x86_64-linux-gnu",
> >              "arm64": "aarch64-linux-gnu",
> >              "armhf": "arm-linux-gnueabihf",
> > -            "i386": "i386-linux-gnu"
> > +            "i386": "i386-linux-gnu",
> > +            "riscv64": "riscv64-linux-gnu",
> >          }
> >  
> >          distro_arch = get_bitbake_var("DISTRO_ARCH")
> 
> Now, does the swupdate image work with that already? Can we enabled
> it
> in Kconfig then? Or are there more changes still needed?

Given that patch 2 of this series is also applied, this works.
It has been tested on the StarFive VisionFive2 board.

Felix

> 
> Jan
> 

Re: [isar-cip-core][PATCH 3/3] wic(ebg): add support for riscv64

[Jan Kiszka]

On 13.02.23 16:15, Moessbauer, Felix (T CED INW-CN) wrote:
> On Mon, 2023-02-13 at 15:45 +0100, Jan Kiszka wrote:
>> On 13.02.23 09:57, Felix Moessbauer wrote:
>>> This patch adds the mapping between the efi architecture and the
>>> distro
>>> architecture for riscv64.
>>>
>>> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
>>> ---
>>>  scripts/lib/wic/plugins/source/efibootguard-boot.py | 6 ++++--
>>>  scripts/lib/wic/plugins/source/efibootguard-efi.py  | 6 ++++--
>>>  2 files changed, 8 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py
>>> b/scripts/lib/wic/plugins/source/efibootguard-boot.py
>>> index 3d6b2d7..0de28ca 100644
>>> --- a/scripts/lib/wic/plugins/source/efibootguard-boot.py
>>> +++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py
>>> @@ -185,13 +185,15 @@ class EfibootguardBootPlugin(SourcePlugin):
>>>              "amd64": "x64",
>>>              "arm64": "aa64",
>>>              "armhf": "arm",
>>> -            "i386": "ia32"
>>> +            "i386": "ia32",
>>> +            "riscv64" : "riscv64"
>>>          }
>>>          distro_to_lib_arch = {
>>>              "amd64": "x86_64-linux-gnu",
>>>              "arm64": "aarch64-linux-gnu",
>>>              "armhf": "arm-linux-gnueabihf",
>>> -            "i386": "i386-linux-gnu"
>>> +            "i386": "i386-linux-gnu",
>>> +            "riscv64": "riscv64-linux-gnu",
>>>          }
>>>          rootfs_path = rootfs_dir.get('ROOTFS_DIR')
>>>          distro_arch = get_bitbake_var("DISTRO_ARCH")
>>> diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py
>>> b/scripts/lib/wic/plugins/source/efibootguard-efi.py
>>> index 2d16fe3..d6cdf0f 100644
>>> --- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
>>> +++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
>>> @@ -56,14 +56,16 @@ class EfibootguardEFIPlugin(SourcePlugin):
>>>              "amd64": "x64",
>>>              "arm64": "aa64",
>>>              "armhf": "arm",
>>> -            "i386": "ia32"
>>> +            "i386": "ia32",
>>> +            "riscv64" : "riscv64"
>>>          }
>>>
>>>          distro_to_lib_arch = {
>>>              "amd64": "x86_64-linux-gnu",
>>>              "arm64": "aarch64-linux-gnu",
>>>              "armhf": "arm-linux-gnueabihf",
>>> -            "i386": "i386-linux-gnu"
>>> +            "i386": "i386-linux-gnu",
>>> +            "riscv64": "riscv64-linux-gnu",
>>>          }
>>>
>>>          distro_arch = get_bitbake_var("DISTRO_ARCH")
>>
>> Now, does the swupdate image work with that already? Can we enabled
>> it
>> in Kconfig then? Or are there more changes still needed?
> 
> Given that patch 2 of this series is also applied, this works.
> It has been tested on the StarFive VisionFive2 board.
> 

Great, then please add patch 4 as well ;)

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [isar-cip-core][PATCH 3/3] wic(ebg): add support for riscv64

[Jan Kiszka]

On 13.02.23 17:21, Jan Kiszka wrote:
> On 13.02.23 16:15, Moessbauer, Felix (T CED INW-CN) wrote:
>> On Mon, 2023-02-13 at 15:45 +0100, Jan Kiszka wrote:
>>> On 13.02.23 09:57, Felix Moessbauer wrote:
>>>> This patch adds the mapping between the efi architecture and the
>>>> distro
>>>> architecture for riscv64.
>>>>
>>>> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
>>>> ---
>>>>  scripts/lib/wic/plugins/source/efibootguard-boot.py | 6 ++++--
>>>>  scripts/lib/wic/plugins/source/efibootguard-efi.py  | 6 ++++--
>>>>  2 files changed, 8 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py
>>>> b/scripts/lib/wic/plugins/source/efibootguard-boot.py
>>>> index 3d6b2d7..0de28ca 100644
>>>> --- a/scripts/lib/wic/plugins/source/efibootguard-boot.py
>>>> +++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py
>>>> @@ -185,13 +185,15 @@ class EfibootguardBootPlugin(SourcePlugin):
>>>>              "amd64": "x64",
>>>>              "arm64": "aa64",
>>>>              "armhf": "arm",
>>>> -            "i386": "ia32"
>>>> +            "i386": "ia32",
>>>> +            "riscv64" : "riscv64"
>>>>          }
>>>>          distro_to_lib_arch = {
>>>>              "amd64": "x86_64-linux-gnu",
>>>>              "arm64": "aarch64-linux-gnu",
>>>>              "armhf": "arm-linux-gnueabihf",
>>>> -            "i386": "i386-linux-gnu"
>>>> +            "i386": "i386-linux-gnu",
>>>> +            "riscv64": "riscv64-linux-gnu",
>>>>          }
>>>>          rootfs_path = rootfs_dir.get('ROOTFS_DIR')
>>>>          distro_arch = get_bitbake_var("DISTRO_ARCH")
>>>> diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py
>>>> b/scripts/lib/wic/plugins/source/efibootguard-efi.py
>>>> index 2d16fe3..d6cdf0f 100644
>>>> --- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
>>>> +++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
>>>> @@ -56,14 +56,16 @@ class EfibootguardEFIPlugin(SourcePlugin):
>>>>              "amd64": "x64",
>>>>              "arm64": "aa64",
>>>>              "armhf": "arm",
>>>> -            "i386": "ia32"
>>>> +            "i386": "ia32",
>>>> +            "riscv64" : "riscv64"
>>>>          }
>>>>
>>>>          distro_to_lib_arch = {
>>>>              "amd64": "x86_64-linux-gnu",
>>>>              "arm64": "aarch64-linux-gnu",
>>>>              "armhf": "arm-linux-gnueabihf",
>>>> -            "i386": "i386-linux-gnu"
>>>> +            "i386": "i386-linux-gnu",
>>>> +            "riscv64": "riscv64-linux-gnu",
>>>>          }
>>>>
>>>>          distro_arch = get_bitbake_var("DISTRO_ARCH")
>>>
>>> Now, does the swupdate image work with that already? Can we enabled
>>> it
>>> in Kconfig then? Or are there more changes still needed?
>>
>> Given that patch 2 of this series is also applied, this works.
>> It has been tested on the StarFive VisionFive2 board.
>>
> 
> Great, then please add patch 4 as well ;)
> 

...targeting qemu-riscv64, obviously.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux