summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <festevam@denx.de>2025-03-04 10:11:05 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-06 11:16:47 +0000
commit768a0f6c7fdd7f788673ecd070a05c8d30ac486c (patch)
tree98b3de6718c29f22b6c818f085b1b4104e9883bb
parent58f56c364936c2c675d68ac1a3e1886ddc3b2562 (diff)
downloadpoky-768a0f6c7fdd7f788673ecd070a05c8d30ac486c.tar.gz
mtd-utils: Upgrade to 2.3.0
Upgrade to mtd-utils 2.3.0. Details about the 2.3.0 release: https://lore.kernel.org/linux-mtd/1b7a55a6-1c5b-4e86-8006-e2010e54367e@sigma-star.at/T/#u [RP: Tweak SRC_URI formatting] (From OE-Core rev: b72823fc09674f78ad452250f453f6e47d9444de) Signed-off-by: Fabio Estevam <festevam@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch53
-rw-r--r--meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch41
-rw-r--r--meta/recipes-devtools/mtd/files/0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch66
-rw-r--r--meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch41
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb (renamed from meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb)8
5 files changed, 207 insertions, 2 deletions
diff --git a/meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch b/meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch
new file mode 100644
index 0000000000..a9ececc14c
--- /dev/null
+++ b/meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch
@@ -0,0 +1,53 @@
1From 2fc872697f72214e1e3efc6c2523e374fa5d681d Mon Sep 17 00:00:00 2001
2From: Fabio Estevam <festevam@gmail.com>
3Date: Mon, 17 Feb 2025 16:02:04 -0300
4Subject: [PATCH v4 mtd-utils 1/4] ubifs-utils: ubifs.h: Include <fcntl.h>
5
6Include the <fcntl.h> header file to fix the following error
7when building with musl:
8
9| In file included from ../git/ubifs-utils/common/compr.c:42:
10| ../git/ubifs-utils/libubifs/ubifs.h:313:9: error: unknown type name 'loff_t'; did you mean 'off_t'?
11| 313 | loff_t ui_size;
12| | ^~~~~~
13| | off_t
14| ../git/ubifs-utils/libubifs/ubifs.h:1341:9: error: unknown type name 'loff_t'; did you mean 'off_t'?
15| 1341 | loff_t i_size;
16| | ^~~~~~
17| | off_t
18| ../git/ubifs-utils/libubifs/ubifs.h:1342:9: error: unknown type name 'loff_t'; did you mean 'off_t'?
19| 1342 | loff_t d_size;
20| | ^~~~~~
21| | off_t
22| ../git/ubifs-utils/libubifs/ubifs.h:1899:44: error: unknown type name 'loff_t'; did you mean 'off_t'?
23| 1899 | int deletion, loff_t new_size);
24| | ^~~~~~
25| | off_t
26| make: *** [Makefile:4878: ubifs-utils/common/mkfs_ubifs-compr.o] Error 1
27
28Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/20250219130244.2119582-1-festevam@gmail.com/T/#t]
29Signed-off-by: Fabio Estevam <festevam@gmail.com>
30Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
31Reviewed-by: Khem Raj <raj.khem@gmail.com>
32---
33Changes since v3:
34- Removed Upstream-Status tag.
35
36 ubifs-utils/libubifs/ubifs.h | 1 +
37 1 file changed, 1 insertion(+)
38
39diff --git a/ubifs-utils/libubifs/ubifs.h b/ubifs-utils/libubifs/ubifs.h
40index 0908a2289208..1c7bc7bd0c80 100644
41--- a/ubifs-utils/libubifs/ubifs.h
42+++ b/ubifs-utils/libubifs/ubifs.h
43@@ -11,6 +11,7 @@
44 #ifndef __UBIFS_H__
45 #define __UBIFS_H__
46
47+#include <fcntl.h>
48 #include <string.h>
49
50 #include "linux_types.h"
51--
522.34.1
53
diff --git a/meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch b/meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch
new file mode 100644
index 0000000000..ea376437df
--- /dev/null
+++ b/meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch
@@ -0,0 +1,41 @@
1From 65077d8d664821e323d011956049c1c1b97d9560 Mon Sep 17 00:00:00 2001
2From: Fabio Estevam <festevam@gmail.com>
3Date: Mon, 17 Feb 2025 16:07:49 -0300
4Subject: [PATCH v4 mtd-utils 2/4] ubifs-utils: journal: Include <sys/stat.h>
5
6Include the <sys/stat.h> header file to fix the following error
7when building with musl:
8
9| ../git/ubifs-utils/libubifs/journal.c: In function 'ubifs_get_dent_type':
10| ../git/ubifs-utils/libubifs/journal.c:414:24: error: 'S_IFMT' undeclared (first use in this function)
11| 414 | switch (mode & S_IFMT) {
12| | ^~~~~~
13| ../git/ubifs-utils/libubifs/journal.c:414:24: note: each undeclared identifier is reported only once for each function it appears in
14| ../git/ubifs-utils/libubifs/journal.c:415:14: error: 'S_IFREG' undeclared (first use in this function)
15| 415 | case S_IFREG:
16
17Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/20250219130244.2119582-2-festevam@gmail.com/T/#t]
18Signed-off-by: Fabio Estevam <festevam@gmail.com>
19Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
20---
21Changes since v3:
22- Removed Upstream-Status tag.
23
24 ubifs-utils/libubifs/journal.c | 1 +
25 1 file changed, 1 insertion(+)
26
27diff --git a/ubifs-utils/libubifs/journal.c b/ubifs-utils/libubifs/journal.c
28index e78ea14f3e69..45d82fd54bdb 100644
29--- a/ubifs-utils/libubifs/journal.c
30+++ b/ubifs-utils/libubifs/journal.c
31@@ -46,6 +46,7 @@
32 * all the nodes.
33 */
34
35+#include <sys/stat.h>
36 #include "bitops.h"
37 #include "kmem.h"
38 #include "ubifs.h"
39--
402.34.1
41
diff --git a/meta/recipes-devtools/mtd/files/0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch b/meta/recipes-devtools/mtd/files/0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch
new file mode 100644
index 0000000000..b4c190d554
--- /dev/null
+++ b/meta/recipes-devtools/mtd/files/0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch
@@ -0,0 +1,66 @@
1From 52db447c94974cd946de8d9d7031b91d41ad1280 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Wed, 26 Feb 2025 18:24:00 +0000
4Subject: [PATCH 3/4] ubifs-utils: link libmissing.a in case execinfo.h isn't
5 present
6
7On musl execinfo.h doesn't exist, but ubifs-utils uses backtrace() when
8reporting errors. This results in build failures under musl.
9
10Handily, libmissing.a already exists with a stub implementation of
11backtrace().
12
13Guard the execinfo.h include and if it isn't available instead include
14libmissing.h, and link to libmissing.a to provide backtrace() if needed.
15
16Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/20250226182400.1723418-1-ross.burton@arm.com/]
17Signed-off-by: Ross Burton <ross.burton@arm.com>
18Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
19Signed-off-by: Fabio Estevam <festevam@gmail.com>
20---
21 ubifs-utils/Makemodule.am | 4 ++--
22 ubifs-utils/common/defs.h | 5 ++++-
23 2 files changed, 6 insertions(+), 3 deletions(-)
24
25diff --git a/ubifs-utils/Makemodule.am b/ubifs-utils/Makemodule.am
26index 21ba0597d84a..f84569a6da44 100644
27--- a/ubifs-utils/Makemodule.am
28+++ b/ubifs-utils/Makemodule.am
29@@ -72,7 +72,7 @@ mkfs_ubifs_SOURCES = \
30 ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
31
32 mkfs_ubifs_LDADD = libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(UUID_LIBS) $(LIBSELINUX_LIBS) $(OPENSSL_LIBS) \
33- $(DUMP_STACK_LD) $(ASAN_LIBS) -lm -lpthread
34+ $(DUMP_STACK_LD) $(ASAN_LIBS) -lm -lpthread libmissing.a
35 mkfs_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS) \
36 -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common -I $(top_srcdir)/ubifs-utils/libubifs
37
38@@ -90,7 +90,7 @@ fsck_ubifs_SOURCES = \
39 ubifs-utils/fsck.ubifs/handle_disconnected.c
40
41 fsck_ubifs_LDADD = libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(UUID_LIBS) $(LIBSELINUX_LIBS) $(OPENSSL_LIBS) \
42- $(DUMP_STACK_LD) $(ASAN_LIBS) -lm -lpthread
43+ $(DUMP_STACK_LD) $(ASAN_LIBS) -lm -lpthread libmissing.a
44 fsck_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS) \
45 -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common -I $(top_srcdir)/ubifs-utils/libubifs \
46 -I$(top_srcdir)/ubifs-utils/fsck.ubifs
47diff --git a/ubifs-utils/common/defs.h b/ubifs-utils/common/defs.h
48index 7ff1771674d9..d5edbf67439a 100644
49--- a/ubifs-utils/common/defs.h
50+++ b/ubifs-utils/common/defs.h
51@@ -13,8 +13,11 @@
52 #include <errno.h>
53 #include <time.h>
54 #include <assert.h>
55+#if HAVE_EXECINFO_H
56 #include <execinfo.h>
57-
58+#else
59+#include "libmissing.h"
60+#endif
61 #include "ubifs.h"
62
63 /* common.h requires the PROGRAM_NAME macro */
64--
652.34.1
66
diff --git a/meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch b/meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch
new file mode 100644
index 0000000000..87806af27d
--- /dev/null
+++ b/meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch
@@ -0,0 +1,41 @@
1From f218be1ce0c8923d690221160a3dd9f1492acaf1 Mon Sep 17 00:00:00 2001
2From: Fabio Estevam <festevam@gmail.com>
3Date: Tue, 18 Feb 2025 08:17:30 -0300
4Subject: [PATCH v4 mtd-utils 4/4] ubifs-utils: extract_files: Include <linux/limits.h>
5
6Include <linux/limits.h> to fix the following build error when building
7with musl:
8
9| ../git/ubifs-utils/fsck.ubifs/extract_files.c: In function 'parse_ino_node':
10| ../git/ubifs-utils/fsck.ubifs/extract_files.c:144:47: error: 'XATTR_LIST_MAX' undeclared (first use in this function)
11| 144 | if (ino_node->xnms + ino_node->xcnt > XATTR_LIST_MAX) {
12| | ^~~~~~~~~~~~~~
13| ../git/ubifs-utils/fsck.ubifs/extract_files.c:144:47: note: each undeclared identifier is reported only once for each function it appears in
14| make: *** [Makefile:4374: ubifs-utils/fsck.ubifs/fsck_ubifs-extract_files.o] Error 1
15
16Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/20250219130244.2119582-4-festevam@gmail.com/T/#t]
17Signed-off-by: Fabio Estevam <festevam@gmail.com>
18Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
19---
20Changes since v3:
21- None.
22
23 ubifs-utils/fsck.ubifs/extract_files.c | 2 ++
24 1 file changed, 2 insertions(+)
25
26diff --git a/ubifs-utils/fsck.ubifs/extract_files.c b/ubifs-utils/fsck.ubifs/extract_files.c
27index c83d37749bc0..000ef5d10565 100644
28--- a/ubifs-utils/fsck.ubifs/extract_files.c
29+++ b/ubifs-utils/fsck.ubifs/extract_files.c
30@@ -10,6 +10,8 @@
31 #include <getopt.h>
32 #include <sys/stat.h>
33
34+#include <linux/limits.h>
35+
36 #include "linux_err.h"
37 #include "bitops.h"
38 #include "kmem.h"
39--
402.34.1
41
diff --git a/meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb b/meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb
index 5ab5f6c729..aa593ac14f 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb
@@ -11,8 +11,12 @@ inherit autotools pkgconfig update-alternatives
11DEPENDS = "zlib e2fsprogs util-linux" 11DEPENDS = "zlib e2fsprogs util-linux"
12RDEPENDS:mtd-utils-tests += "bash" 12RDEPENDS:mtd-utils-tests += "bash"
13 13
14SRCREV = "13ec33609213c1dbd75852a09560a707a7f19a5c" 14SRCREV = "4594fc1f4496a0ed55cabd31fbeba4e3fbf05602"
15SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master" 15SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
16 file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch \
17 file://0002-ubifs-utils-journal-Include-sys-stat.h.patch \
18 file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch \
19 file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch"
16 20
17S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
18 22
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-04-29 19:54:59 +0000