From: Wang Mingyu Date: Mon, 12 May 2025 09:02:47 +0000 (+0800) Subject: barebox-tools: upgrade 2025.03.0 -> 2025.04.0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe299607a9ba8dbdd3d45c12e75c423cc8f3971e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git barebox-tools: upgrade 2025.03.0 -> 2025.04.0 0001-scripts-dtc-clean-up-yamltree-from-dtc.patch removed since it's included in 2025.04.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-bsp/barebox/barebox-common.inc b/meta/recipes-bsp/barebox/barebox-common.inc index 7fd7a88d71..d6ea1eedfe 100644 --- a/meta/recipes-bsp/barebox/barebox-common.inc +++ b/meta/recipes-bsp/barebox/barebox-common.inc @@ -3,6 +3,6 @@ SECTION = "bootloaders" LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" -PV = "2025.03.0" +PV = "2025.04.0" SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2" -SRC_URI[sha256sum] = "0bf7118004e445bdd57feeef89ee9064982acc221e8a046c4a7994d3da6da2ec" +SRC_URI[sha256sum] = "3124f3c2b69d9ce0512b2d40fa17cace9c356f65f005a63da0474387b8839c41" diff --git a/meta/recipes-bsp/barebox/barebox-tools.bb b/meta/recipes-bsp/barebox/barebox-tools.bb index f6395beb7c..2a117bc9c0 100644 --- a/meta/recipes-bsp/barebox/barebox-tools.bb +++ b/meta/recipes-bsp/barebox/barebox-tools.bb @@ -2,10 +2,6 @@ SUMMARY = "barebox bootloader tools" require barebox-common.inc -SRC_URI += " \ - file://0001-scripts-dtc-clean-up-yamltree-from-dtc.patch \ -" - LICENSE = "GPL-2.0-only" DEPENDS = "bison-native flex-native libusb1" diff --git a/meta/recipes-bsp/barebox/files/0001-scripts-dtc-clean-up-yamltree-from-dtc.patch b/meta/recipes-bsp/barebox/files/0001-scripts-dtc-clean-up-yamltree-from-dtc.patch deleted file mode 100644 index fdab21ef72..0000000000 --- a/meta/recipes-bsp/barebox/files/0001-scripts-dtc-clean-up-yamltree-from-dtc.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 77afd065dc58e2f57066ef7f392c571f8136723d Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 7 Apr 2025 14:45:27 +0000 -Subject: [PATCH] scripts/dtc: clean up yamltree from dtc - -Refer Linux commit [dt-bindings: kbuild: Use DTB files for validation][1], -clean up yamltree from dtc to avoid compile failure while include -in non-standard path - -Since barebox actually doesn't do any dtb binding checks at the moment, just -remove the test of /usr/include/yaml.h, hard-code the -DNO_YAML and remove -yamltree.c from DTC_SOURCE - -[1] https://github.com/torvalds/linux/commit/ef8795f3f1ce - -Upstream-Status: Submitted [https://github.com/barebox/barebox/pull/37] - -Signed-off-by: Hongxu Jia ---- - scripts/dtc/Makefile | 9 --------- - scripts/dtc/update-dtc-source.sh | 2 +- - 2 files changed, 1 insertion(+), 10 deletions(-) - -diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile -index 721e8e2b..da00319f 100644 ---- a/scripts/dtc/Makefile -+++ b/scripts/dtc/Makefile -@@ -16,16 +16,7 @@ fdtget-objs += fdtget.o $(libfdt-objs) util.o - # Source files need to get at the userspace version of libfdt_env.h to compile - HOST_EXTRACFLAGS += -I$(src)/libfdt - --ifeq ($(wildcard /usr/include/yaml.h),) --ifneq ($(CHECK_DTBS),) --$(error dtc needs libyaml for DT schema validation support. \ -- Install the necessary libyaml development package.) --endif - HOST_EXTRACFLAGS += -DNO_YAML --else --dtc-objs += yamltree.o --HOSTLDLIBS_dtc := -lyaml --endif - - # Generated files need one more search path to include headers in source tree - HOSTCFLAGS_dtc-lexer.lex.o := -I$(src) -diff --git a/scripts/dtc/update-dtc-source.sh b/scripts/dtc/update-dtc-source.sh -index 141d3629..8aa5cd66 100755 ---- a/scripts/dtc/update-dtc-source.sh -+++ b/scripts/dtc/update-dtc-source.sh -@@ -31,7 +31,7 @@ DTC_UPSTREAM_PATH=`pwd`/../dtc - DTC_LINUX_PATH=`pwd`/scripts/dtc - - DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c \ -- srcpos.h treesource.c util.c util.h version_gen.h yamltree.c Makefile.dtc \ -+ srcpos.h treesource.c util.c util.h version_gen.h Makefile.dtc \ - dtc-lexer.l dtc-parser.y fdtget.c" - LIBFDT_SOURCE="Makefile.libfdt fdt.c fdt.h fdt_addresses.c fdt_empty_tree.c \ - fdt_overlay.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c \ --- -2.48.1 -