Skip to contentSkip to conversation

mtd-utils: Upgrade to 2.3.0

PATCH In review Fabio Estevam 2 participants 4 messages Mar 4, 2025 – Mar 6, 2025

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 mtd-utils: Upgrade to 2.3.0

From: Fabio Estevam <[email protected]>

Upgrade to mtd-utils 2.3.0.

Details about the 2.3.0 release:

https://lore.kernel.org/linux-mtd/[email protected]/T/#u

---
Changes since v3:
- Applied Ross' mtd-utils patch. With this patch it is no longer needed to move libexecinfo to the oe-core.

 ...-ubifs-utils-ubifs.h-Include-fcntl.h.patch | 53 +++++++++++++++
 ...ifs-utils-journal-Include-sys-stat.h.patch | 41 ++++++++++++
 ...-libmissing.a-in-case-execinfo.h-isn.patch | 66 +++++++++++++++++++
 ...extract_files-Include-linux-limits.h.patch | 41 ++++++++++++
 ...{mtd-utils_2.2.1.bb => mtd-utils_2.3.0.bb} |  6 +-
 5 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch
 create mode 100644 meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch
 create mode 100644 meta/recipes-devtools/mtd/files/0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch
 create mode 100644 meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch
 rename meta/recipes-devtools/mtd/{mtd-utils_2.2.1.bb => mtd-utils_2.3.0.bb} (91%)
meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch new file +53 -0
new file mode 100644
index 0000000000..a9ececc14c
@@ -0,0 +1,53 @@
+From 2fc872697f72214e1e3efc6c2523e374fa5d681d Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <[email protected]>
+Date: Mon, 17 Feb 2025 16:02:04 -0300
+Subject: [PATCH v4 mtd-utils 1/4] ubifs-utils: ubifs.h: Include <fcntl.h>
+
+Include the <fcntl.h> header file to fix the following error
+when building with musl:
+
+| In file included from ../git/ubifs-utils/common/compr.c:42:
+| ../git/ubifs-utils/libubifs/ubifs.h:313:9: error: unknown type name 'loff_t'; did you mean 'off_t'?
+|   313 |         loff_t ui_size;
+|       |         ^~~~~~
+|       |         off_t
+| ../git/ubifs-utils/libubifs/ubifs.h:1341:9: error: unknown type name 'loff_t'; did you mean 'off_t'?
+|  1341 |         loff_t i_size;
+|       |         ^~~~~~
+|       |         off_t
+| ../git/ubifs-utils/libubifs/ubifs.h:1342:9: error: unknown type name 'loff_t'; did you mean 'off_t'?
+|  1342 |         loff_t d_size;
+|       |         ^~~~~~
+|       |         off_t
+| ../git/ubifs-utils/libubifs/ubifs.h:1899:44: error: unknown type name 'loff_t'; did you mean 'off_t'?
+|  1899 |                              int deletion, loff_t new_size);
+|       |                                            ^~~~~~
+|       |                                            off_t
+| make: *** [Makefile:4878: ubifs-utils/common/mkfs_ubifs-compr.o] Error 1
+
+Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/[email protected]/T/#t]
+Signed-off-by: Fabio Estevam <[email protected]>
+Reviewed-by: Zhihao Cheng <[email protected]>
+Reviewed-by: Khem Raj <[email protected]>
+---
+Changes since v3:
+- Removed Upstream-Status tag.
+
+ ubifs-utils/libubifs/ubifs.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ubifs-utils/libubifs/ubifs.h b/ubifs-utils/libubifs/ubifs.h
+index 0908a2289208..1c7bc7bd0c80 100644
+--- a/ubifs-utils/libubifs/ubifs.h
++++ b/ubifs-utils/libubifs/ubifs.h
+@@ -11,6 +11,7 @@
+ #ifndef __UBIFS_H__
+ #define __UBIFS_H__
+ 
++#include <fcntl.h>
+ #include <string.h>
+ 
+ #include "linux_types.h"
+-- 
+2.34.1
+
meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch new file +41 -0

41 lines not on this page · raw message

meta/recipes-devtools/mtd/files/0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch new file +66 -0

66 lines not on this page · raw message

meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch new file +41 -0

41 lines not on this page · raw message

meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb renamed from meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb +5 -1
similarity index 91%
rename from meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb
rename to meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb
index 5ab5f6c729..7a132a9aef 100644
@@ -11,8 +11,12 @@ inherit autotools pkgconfig update-alternatives
 DEPENDS = "zlib e2fsprogs util-linux"
 RDEPENDS:mtd-utils-tests += "bash"
 
-SRCREV = "13ec33609213c1dbd75852a09560a707a7f19a5c"
+SRCREV = "4594fc1f4496a0ed55cabd31fbeba4e3fbf05602"
 SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master"
+SRC_URI += "file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch"
+SRC_URI += "file://0002-ubifs-utils-journal-Include-sys-stat.h.patch"
+SRC_URI += "file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch"
+SRC_URI += "file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.40.1
#1 lore raw

Hi Fabio,

On Tue Mar 4, 2025 at 2:11 PM CET, Fabio Estevam via lists.openembedded.org wrote:
[...]

Quoted 8 lines
meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb renamed from meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb +0 -0
similarity index 91%
rename from meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb
rename to meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb
index 5ab5f6c729..7a132a9aef 100644

meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb inherit autotools pkgconfig update-alternatives · line 19

Quoted 10 lines
meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb renamed from meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb +5 -1
@@ -11,8 +11,12 @@ inherit autotools pkgconfig update-alternatives
 DEPENDS = "zlib e2fsprogs util-linux"
 RDEPENDS:mtd-utils-tests += "bash"
 
-SRCREV = "13ec33609213c1dbd75852a09560a707a7f19a5c"
+SRCREV = "4594fc1f4496a0ed55cabd31fbeba4e3fbf05602"
 SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master"
+SRC_URI += "file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch"
+SRC_URI += "file://0002-ubifs-utils-journal-Include-sys-stat.h.patch"
+SRC_URI += "file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch"
+SRC_URI += "file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch"

You can make a single SRC_URI assignment here:

  SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
             file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch \
             file://0002-ubifs-utils-journal-Include-sys-stat.h.patch \
             file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch \
             file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch \
             "

It will make parsing a bit faster.

Antonin

Signature · 3 lines
Antonin Godard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

Hi Antonin,

Quoted 10 lines · Antonin Godard

You can make a single SRC_URI assignment here:

  SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
             file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch \
             file://0002-ubifs-utils-journal-Include-sys-stat.h.patch \
             file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch \
             file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch \
             "

It will make parsing a bit faster.

Richard tweaked the SRC_URI line as you suggested:

https://github.com/yoctoproject/poky/commit/768a0f6c7fdd7f788673ecd070a05c8d30ac486c

I will do it like this next time.

Thanks

#3 lore raw
Quoted 14 lines · Fabio Estevam

Hi Antonin,

Quoted 9 lines · Antonin Godard

You can make a single SRC_URI assignment here:

  SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
             file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch \
             file://0002-ubifs-utils-journal-Include-sys-stat.h.patch \
             file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch \
             file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch \
             "
Quoted 7 lines
Quoted 1 line

It will make parsing a bit faster.

Richard tweaked the SRC_URI line as you suggested:

https://github.com/yoctoproject/poky/commit/768a0f6c7fdd7f788673ecd070a05c8d30ac486c

I will do it like this next time.

Ha, ok, sorry didn't see this :)

Antonin

Signature · 3 lines
Antonin Godard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com