diff mbox series

kernel-arch.bbclass: Map arm64 to arm

Message ID 20230220124231.17673-1-pavel@zhukoff.net
State New
Headers show
Series kernel-arch.bbclass: Map arm64 to arm | expand

Commit Message

Pavel Zhukov Feb. 20, 2023, 12:42 p.m. UTC
The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm' so
adding arm64 case to existing map.

Fixes:
| install: cannot stat '.../u-boot/1_2023.01-r0/build/arch/arm64/dts/u-boot.dtb': No such file or directory

Signed-off-by: Pavel Zhukov <pavel@zhukoff.net>
---
 meta/classes-recipe/kernel-arch.bbclass | 1 +
 1 file changed, 1 insertion(+)

Comments

Alexandre Belloni Feb. 22, 2023, 6:22 p.m. UTC | #1
Hello,

This is the cause of:

https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/995/steps/14/logs/stdio

2023-02-22 11:33:00,834 - oe-selftest - INFO - fitimage.FitImageTests.test_fit_image (subunit.RemotedTestCase)
2023-02-22 11:33:00,835 - oe-selftest - INFO -  ... FAIL

|   OBJCOPY arch/arm64/boot/Image
| NOTE: make -j 16 -l 52 CC=aarch64-poky-linux-gcc   -fuse-ld=bfd -fmacro-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work-shared/qemuarm64/kernel-source=/usr/src/debug/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0  -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work-shared/qemuarm64/kernel-source=/usr/src/debug/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0  -fmacro-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/linux-qemuarm64-standard-build=/usr/src/debug/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0  -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/linux-qemuarm64-standard-build=/usr/src/debug/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0  -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot=  -fmacro-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot=  -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native=  -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work-shared/qemuarm64/kernel-source=/usr/src/kernel -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work-shared/qemuarm64/kernel-build-artifacts=/usr/src/kernel  --sysroot=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot LD=aarch64-poky-linux-ld.bfd    --sysroot=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot HOSTCC=gcc  HOSTCFLAGS=-isystem/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/include -O2 -pipe HOSTLDFLAGS=-L/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/lib                         -L/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/lib                         -Wl,--enable-new-dtags                         -Wl,-rpath-link,/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/lib                         -Wl,-rpath-link,/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/lib                         -Wl,-rpath,/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/lib                         -Wl,-rpath,/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/lib                         -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/sysroots-uninative/aarch64-linux/lib/ld-linux-aarch64.so.1 HOSTCP
=gcc  -E HOSTCXX=g++  HOSTCXXFLAGS=-isystem/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/include -O2 -pipe PAHOLE=false zImage
| make: *** No rule to make target 'zImage'.  Stop.
| ERROR: oe_runmake failed

On 20/02/2023 13:42:31+0100, Pavel Zhukov wrote:
> The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm' so
> adding arm64 case to existing map.
> 
> Fixes:
> | install: cannot stat '.../u-boot/1_2023.01-r0/build/arch/arm64/dts/u-boot.dtb': No such file or directory
> 
> Signed-off-by: Pavel Zhukov <pavel@zhukoff.net>
> ---
>  meta/classes-recipe/kernel-arch.bbclass | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/classes-recipe/kernel-arch.bbclass b/meta/classes-recipe/kernel-arch.bbclass
> index 777f900241..4f88c47ef1 100644
> --- a/meta/classes-recipe/kernel-arch.bbclass
> +++ b/meta/classes-recipe/kernel-arch.bbclass
> @@ -55,6 +55,7 @@ def map_uboot_arch(a, d):
>      import re
>  
>      if   re.match('p(pc|owerpc)(|64)', a): return 'ppc'
> +    elif re.match('arm(|64)', a): return 'arm'
>      elif re.match('i.86$', a): return 'x86'
>      return a
>  
> -- 
> 2.39.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#177399): https://lists.openembedded.org/g/openembedded-core/message/177399
> Mute This Topic: https://lists.openembedded.org/mt/97084683/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Pavel Zhukov Feb. 22, 2023, 9:36 p.m. UTC | #2
Alexandre Belloni <alexandre.belloni@bootlin.com> writes:

> Hello,
>
> This is the cause of:
Hi Alex,
Yes, my fault, sorry about that.
Arm64 is valid U-boot/mkimage architecture. Proper fix sent as:
"[PATCH] u-boot: Map arm64 into map for u-boot dts installation"

This patch can be dropped. 

>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/995/steps/14/logs/stdio
>
> 2023-02-22 11:33:00,834 - oe-selftest - INFO - fitimage.FitImageTests.test_fit_image (subunit.RemotedTestCase)
> 2023-02-22 11:33:00,835 - oe-selftest - INFO -  ... FAIL
>
> |   OBJCOPY arch/arm64/boot/Image
> | NOTE: make -j 16 -l 52 CC=aarch64-poky-linux-gcc -fuse-ld=bfd
> | -fmacro-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work-shared/qemuarm64/kernel-source=/usr/src/debug/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0
> | -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work-shared/qemuarm64/kernel-source=/usr/src/debug/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0
> | -fmacro-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/linux-qemuarm64-standard-build=/usr/src/debug/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0
> | -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/linux-qemuarm64-standard-build=/usr/src/debug/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0
> | -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot=
> | -fmacro-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot=
> | -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native=
> | -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work-shared/qemuarm64/kernel-source=/usr/src/kernel
> | -fdebug-prefix-map=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work-shared/qemuarm64/kernel-build-artifacts=/usr/src/kernel
> | --sysroot=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot
> | LD=aarch64-poky-linux-ld.bfd
> | --sysroot=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot
> | HOSTCC=gcc
> | HOSTCFLAGS=-isystem/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/include
> | -O2 -pipe
> | HOSTLDFLAGS=-L/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/lib
> | -L/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/lib
> | -Wl,--enable-new-dtags
> | -Wl,-rpath-link,/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/lib
> | -Wl,-rpath-link,/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/lib
> | -Wl,-rpath,/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/lib
> | -Wl,-rpath,/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/lib
> | -Wl,-O1 -Wl,--allow-shlib-undefined
> | -Wl,--dynamic-linker=/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/sysroots-uninative/aarch64-linux/lib/ld-linux-aarch64.so.1
> | HOSTCP
> =gcc -E HOSTCXX=g++
> HOSTCXXFLAGS=-isystem/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3486447/tmp/work/qemuarm64-poky-linux/linux-yocto/6.1.9+gitAUTOINC+d7393c5752_1caf99d568-r0/recipe-sysroot-native/usr/include
> -O2 -pipe PAHOLE=false zImage
> | make: *** No rule to make target 'zImage'.  Stop.
> | ERROR: oe_runmake failed
>
> On 20/02/2023 13:42:31+0100, Pavel Zhukov wrote:
>> The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm' so
>> adding arm64 case to existing map.
>> 
>> Fixes:
>> | install: cannot stat '.../u-boot/1_2023.01-r0/build/arch/arm64/dts/u-boot.dtb': No such file or directory
>> 
>> Signed-off-by: Pavel Zhukov <pavel@zhukoff.net>
>> ---
>>  meta/classes-recipe/kernel-arch.bbclass | 1 +
>>  1 file changed, 1 insertion(+)
>> 
>> diff --git a/meta/classes-recipe/kernel-arch.bbclass b/meta/classes-recipe/kernel-arch.bbclass
>> index 777f900241..4f88c47ef1 100644
>> --- a/meta/classes-recipe/kernel-arch.bbclass
>> +++ b/meta/classes-recipe/kernel-arch.bbclass
>> @@ -55,6 +55,7 @@ def map_uboot_arch(a, d):
>>      import re
>>  
>>      if   re.match('p(pc|owerpc)(|64)', a): return 'ppc'
>> +    elif re.match('arm(|64)', a): return 'arm'
>>      elif re.match('i.86$', a): return 'x86'
>>      return a
>>  
>> -- 
>> 2.39.1
>> 
>
>> 
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#177399): https://lists.openembedded.org/g/openembedded-core/message/177399
>> Mute This Topic: https://lists.openembedded.org/mt/97084683/3617179
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
diff mbox series

Patch

diff --git a/meta/classes-recipe/kernel-arch.bbclass b/meta/classes-recipe/kernel-arch.bbclass
index 777f900241..4f88c47ef1 100644
--- a/meta/classes-recipe/kernel-arch.bbclass
+++ b/meta/classes-recipe/kernel-arch.bbclass
@@ -55,6 +55,7 @@  def map_uboot_arch(a, d):
     import re
 
     if   re.match('p(pc|owerpc)(|64)', a): return 'ppc'
+    elif re.match('arm(|64)', a): return 'arm'
     elif re.match('i.86$', a): return 'x86'
     return a