diff mbox series

[V2] u-boot: upgrade 2022.04 -> 2022.07

Message ID 20220712151730.10465-1-sakib.sajal@windriver.com
State New
Headers show
Series [V2] u-boot: upgrade 2022.04 -> 2022.07 | expand

Commit Message

Sakib Sajal July 12, 2022, 3:17 p.m. UTC
License change came due to U-Boot commit:
    fba0882bcd Add valgrind headers to U-Boot

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
---
 meta/recipes-bsp/u-boot/u-boot-common.inc                     | 4 ++--
 .../{u-boot-tools_2022.04.bb => u-boot-tools_2022.07.bb}      | 0
 .../u-boot/{u-boot_2022.04.bb => u-boot_2022.07.bb}           | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/u-boot/{u-boot-tools_2022.04.bb => u-boot-tools_2022.07.bb} (100%)
 rename meta/recipes-bsp/u-boot/{u-boot_2022.04.bb => u-boot_2022.07.bb} (100%)

Comments

Alexandre Belloni July 13, 2022, 7:29 a.m. UTC | #1
Hello Sakib,

This fails with:

| make -f /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/Makefile.build obj=scripts/dtc/pylibfdt
|   cat /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/pylibfdt/libfdt.i_shipped > scripts/dtc/pylibfdt/libfdt.i
|   unset CROSS_COMPILE; unset CFLAGS; CC="gcc  -isystem/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/usr/lib                         -L/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/lib                         -Wl,--enable-new-dtags                         -Wl,-rpath-link,/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/usr/lib                         -Wl,-rpath-link,/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/lib                         -Wl,-rpath,/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/usr/lib                         -Wl,-rpath,/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/lib                         -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2" LDSHARED="gcc  -isystem/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/usr/lib                         -L/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/lib                         -Wl,--enable-new-dtags                         -Wl,-rpath-link,/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/usr/lib                         -Wl,-rpath-link,/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/lib                         -Wl,-rpath,/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/usr/lib                         -Wl,-rpath,/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/recipe-sysroot-native/lib                         -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 -shared " LDFLAGS="" VERSION="u-boot-2022.07" CPPFLAGS=" -I/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt" OBJDIR=scripts/dtc/pylibfdt SOURCES="/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/fdt.c /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/fdt_ro.c /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/fdt_wip.c /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/fdt_sw.c /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/fdt_rw.c /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/fdt_strerror.c /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/fdt_empty_tree.c /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/fdt_addresses.c /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/fdt_overlay.c scripts/dtc/pylibfdt/libfdt.i" SWIG_OPTS="-I/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt -I/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/libfdt/.." python3 /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/pylibfdt/setup.py --quiet build_ext --inplace
| /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/pylibfdt/setup.py:21: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
|   from distutils.core import setup, Extension
| error: command 'swig' failed: No such file or directory
| make[3]: *** [/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/pylibfdt/Makefile:30: rebuild] Error 1
| make[1]: Leaving directory '/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/build'
| make: Leaving directory '/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git'
| make[2]: *** [/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/Makefile.build:398: scripts/dtc/pylibfdt] Error 2
| make[1]: *** [/home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/Makefile:2066: scripts_dtc] Error 2
| make: *** [Makefile:177: sub-make] Error 2
| ERROR: oe_runmake failed

https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/5414/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/3206/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/5490/steps/11/logs/stdio



On 12/07/2022 11:17:30-0400, Sakib Sajal wrote:
> License change came due to U-Boot commit:
>     fba0882bcd Add valgrind headers to U-Boot
> 
> Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
> ---
>  meta/recipes-bsp/u-boot/u-boot-common.inc                     | 4 ++--
>  .../{u-boot-tools_2022.04.bb => u-boot-tools_2022.07.bb}      | 0
>  .../u-boot/{u-boot_2022.04.bb => u-boot_2022.07.bb}           | 0
>  3 files changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-bsp/u-boot/{u-boot-tools_2022.04.bb => u-boot-tools_2022.07.bb} (100%)
>  rename meta/recipes-bsp/u-boot/{u-boot_2022.04.bb => u-boot_2022.07.bb} (100%)
> 
> diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
> index 8fc33608d0..d7fd3c7227 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-common.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
> @@ -7,12 +7,12 @@ SECTION = "bootloaders"
>  DEPENDS += "flex-native bison-native"
>  
>  LICENSE = "GPL-2.0-or-later"
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
> +LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
>  PE = "1"
>  
>  # We use the revision in order to avoid having to fetch it from the
>  # repo during parse
> -SRCREV = "e4b6ebd3de982ae7185dbf689a030e73fd06e0d2"
> +SRCREV = "e092e3250270a1016c877da7bdd9384f14b1321e"
>  
>  SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
>  
> diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2022.07.bb
> similarity index 100%
> rename from meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb
> rename to meta/recipes-bsp/u-boot/u-boot-tools_2022.07.bb
> diff --git a/meta/recipes-bsp/u-boot/u-boot_2022.04.bb b/meta/recipes-bsp/u-boot/u-boot_2022.07.bb
> similarity index 100%
> rename from meta/recipes-bsp/u-boot/u-boot_2022.04.bb
> rename to meta/recipes-bsp/u-boot/u-boot_2022.07.bb
> -- 
> 2.33.0
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#167935): https://lists.openembedded.org/g/openembedded-core/message/167935
> Mute This Topic: https://lists.openembedded.org/mt/92335149/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Fabio Estevam July 13, 2022, 2:03 p.m. UTC | #2
Hi Alexandre and Sakib,

On Wed, Jul 13, 2022 at 4:29 AM Alexandre Belloni via
lists.openembedded.org
<alexandre.belloni=bootlin.com@lists.openembedded.org> wrote:

> | /home/pokybuild/yocto-worker/qemux86-world/build/build/tmp/work/core2-64-poky-linux/u-boot-tools/1_2022.07-r0/git/scripts/dtc/pylibfdt/setup.py:21: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
> |   from distutils.core import setup, Extension
> | error: command 'swig' failed: No such file or directory

Does the change below fix the build problem?

--- a/meta/recipes-bsp/u-boot/u-boot-tools.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-tools.inc
@@ -1,5 +1,5 @@
 SUMMARY = "U-Boot bootloader tools"
-DEPENDS += "gnutls openssl util-linux"
+DEPENDS += "gnutls openssl util-linux swig-native"

 PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage"
 PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native"
diff mbox series

Patch

diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index 8fc33608d0..d7fd3c7227 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -7,12 +7,12 @@  SECTION = "bootloaders"
 DEPENDS += "flex-native bison-native"
 
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "e4b6ebd3de982ae7185dbf689a030e73fd06e0d2"
+SRCREV = "e092e3250270a1016c877da7bdd9384f14b1321e"
 
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
 
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2022.07.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb
rename to meta/recipes-bsp/u-boot/u-boot-tools_2022.07.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot_2022.04.bb b/meta/recipes-bsp/u-boot/u-boot_2022.07.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2022.04.bb
rename to meta/recipes-bsp/u-boot/u-boot_2022.07.bb