[PATCH v2 2/4] barebox: Update to 2024.05.0

[Anton Mikanovich <amikan@ilbers.de>]

To enable building Barebox for Bookworm targets update it to the latest
version available.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 ...ebox_2022.02.0.bb => barebox_2024.05.0.bb} |  2 +-
 ...1-of_dump-Add-a-simple-node-check-up.patch | 20 +++++++++----------
 meta/recipes-bsp/barebox/barebox.inc          |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename meta-isar/recipes-bsp/barebox/{barebox_2022.02.0.bb => barebox_2024.05.0.bb} (79%)

diff --git a/meta-isar/recipes-bsp/barebox/barebox_2022.02.0.bb b/meta-isar/recipes-bsp/barebox/barebox_2024.05.0.bb
similarity index 79%
rename from meta-isar/recipes-bsp/barebox/barebox_2022.02.0.bb
rename to meta-isar/recipes-bsp/barebox/barebox_2024.05.0.bb
index 10758b28..ad0b0c3c 100644
--- a/meta-isar/recipes-bsp/barebox/barebox_2022.02.0.bb
+++ b/meta-isar/recipes-bsp/barebox/barebox_2024.05.0.bb
@@ -10,6 +10,6 @@ SRC_URI += "https://git.pengutronix.de/cgit/barebox/snapshot/barebox-${PV}.tar.g
 
 S = "${WORKDIR}/barebox-${PV}"
 
-SRC_URI[sha256sum] = "01fb3799840bde34014981557361dcae1db23764708bb7b151ec044eb022fbe8"
+SRC_URI[sha256sum] = "f57cba0be683a7e8aca8a0090e42d5913a4efb8bce762d2648f12fd666e2ebc9"
 
 BAREBOX_VERSION_EXTENSION = "-isar"
diff --git a/meta-isar/recipes-bsp/barebox/files/0001-of_dump-Add-a-simple-node-check-up.patch b/meta-isar/recipes-bsp/barebox/files/0001-of_dump-Add-a-simple-node-check-up.patch
index 05caba13..7352d7b3 100644
--- a/meta-isar/recipes-bsp/barebox/files/0001-of_dump-Add-a-simple-node-check-up.patch
+++ b/meta-isar/recipes-bsp/barebox/files/0001-of_dump-Add-a-simple-node-check-up.patch
@@ -1,4 +1,4 @@
-From 4abae0d9cc23ef055c0054e41c515e92fa5267ce Mon Sep 17 00:00:00 2001
+From cd6b45d1921a8d4b5607ef2da6186ae5ac38c2d4 Mon Sep 17 00:00:00 2001
 From: Yunus Bas <y.bas@phytec.de>
 Date: Fri, 4 Jun 2021 19:03:04 +0200
 Subject: [PATCH] of_dump: Add a simple node check-up
@@ -16,29 +16,29 @@ Signed-off-by: Yunus Bas <y.bas@phytec.de>
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/commands/of_dump.c b/commands/of_dump.c
-index 6792af3af..d4d9c46a5 100644
+index 2508d4ce11..da6b65231b 100644
 --- a/commands/of_dump.c
 +++ b/commands/of_dump.c
-@@ -32,14 +32,17 @@ static int do_of_dump(int argc, char *argv[])
+@@ -35,14 +35,17 @@ static int do_of_dump(int argc, char *argv[])
  	int opt;
  	int ret = 0;
  	int fix = 0;
 +	int exists = 0;
  	struct device_node *root = NULL, *node, *of_free = NULL;
  	char *dtbfile = NULL;
- 	size_t size;
  	const char *nodename;
+ 	unsigned maxpropsize = ~0;
  	int names_only = 0, properties_only = 0;
  
--	while ((opt = getopt(argc, argv, "Ff:np")) > 0) {
-+	while ((opt = getopt(argc, argv, "eFf:np")) > 0) {
+-	while ((opt = getopt(argc, argv, "Ff:npP:")) > 0) {
++	while ((opt = getopt(argc, argv, "eFf:npP:")) > 0) {
  		switch (opt) {
 +		case 'e':
 +			exists = 1;
  		case 'f':
  			dtbfile = optarg;
  			break;
-@@ -109,6 +112,9 @@ static int do_of_dump(int argc, char *argv[])
+@@ -92,6 +95,9 @@ static int do_of_dump(int argc, char *argv[])
  		printf("Cannot find nodepath %s\n", nodename);
  		ret = -ENOENT;
  		goto out;
@@ -47,8 +47,8 @@ index 6792af3af..d4d9c46a5 100644
 +		goto out;
  	}
  
- 	if (names_only)
-@@ -125,6 +131,7 @@ out:
+ 	if (names_only && !properties_only)
+@@ -109,6 +115,7 @@ static int do_of_dump(int argc, char *argv[])
  
  BAREBOX_CMD_HELP_START(of_dump)
  BAREBOX_CMD_HELP_TEXT("Options:")
@@ -57,5 +57,5 @@ index 6792af3af..d4d9c46a5 100644
  BAREBOX_CMD_HELP_OPT  ("-F",  "return fixed devicetree")
  BAREBOX_CMD_HELP_OPT  ("-n",  "Print node names only, no properties")
 -- 
-2.30.0
+2.30.2
 
diff --git a/meta/recipes-bsp/barebox/barebox.inc b/meta/recipes-bsp/barebox/barebox.inc
index 73694e23..33470433 100644
--- a/meta/recipes-bsp/barebox/barebox.inc
+++ b/meta/recipes-bsp/barebox/barebox.inc
@@ -7,7 +7,7 @@ DESCRIPTION ?= "The barebox is a bootloader designed for embedded systems. It \
 CHANGELOG_V = "${PV}+${PR}"
 MAINTAINER ?= "isar-users <isar-users@googlegroups.com>"
 
-DEBIAN_BUILD_DEPENDS ?= "lzop, coreutils, bison, flex"
+DEBIAN_BUILD_DEPENDS ?= "lzop, coreutils, bison, flex, lz4"
 
 BAREBOX_CONFIG ?= ""
 BAREBOX_BUILD_DIR ?= "build"
-- 
2.34.1