Skip to contentSkip to conversation

mtd-utils: Upgrade to 2.3.1

PATCH New Fabio Estevam 1 participant 1 message Apr 13

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd-utils: Upgrade to 2.3.1

Upgrade to mtd-utils 2.3.1.

Remove all the local patches as they have all landed in 2.3.1.

Details about the 2.3.1 release:

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

---
 ...prove-check-for-GCC-compiler-version.patch | 34 ----------
 ...-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.3.0.bb => mtd-utils_2.3.1.bb} |  7 +-
 6 files changed, 1 insertion(+), 241 deletions(-)
 delete mode 100644 meta/recipes-devtools/mtd/files/0001-Improve-check-for-GCC-compiler-version.patch
 delete mode 100644 meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch
 delete mode 100644 meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch
 delete mode 100644 meta/recipes-devtools/mtd/files/0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch
 delete 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.3.0.bb => mtd-utils_2.3.1.bb} (91%)
meta/recipes-devtools/mtd/files/0001-Improve-check-for-GCC-compiler-version.patch deleted +0 -34
deleted file mode 100644
index 2329dfece3..0000000000
@@ -1,34 +0,0 @@
-From e7adb21350ff3b96dbd2de56a127e9d916c08d62 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 22 Mar 2025 19:05:32 -0700
-Subject: [PATCH] Improve check for GCC compiler version
-
-When using unreleased compiler has version like
-15.0.1 and that test fails because __GNUC_MINOR__ < 1
-becomes true, therefore check for full version string
-which is more rubust.
-
-Upstream-Status: Backport [https://github.com/sigma-star/mtd-utils/commit/ac0ab65ebcd7b11739986b81343457469fbb43b0]
-Signed-off-by: Khem Raj <[email protected]>
----
- ubifs-utils/common/atomic.h | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ubifs-utils/common/atomic.h b/ubifs-utils/common/atomic.h
-index f287d43..95754b2 100644
---- a/ubifs-utils/common/atomic.h
-+++ b/ubifs-utils/common/atomic.h
-@@ -2,8 +2,12 @@
- #ifndef __ATOMIC_H__
- #define __ATOMIC_H__
- 
-+#define GCC_VERSION (__GNUC__ * 10000 \
-+                     + __GNUC_MINOR__ * 100 \
-+                     + __GNUC_PATCHLEVEL__)
-+
- /* Check GCC version, just to be safe */
--#if !defined(__GNUC__) || (__GNUC__ < 4) || (__GNUC_MINOR__ < 1)
-+#if GCC_VERSION < 40100
- # error atomic.h works only with GCC newer than version 4.1
- #endif /* GNUC >= 4.1 */
- 
meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch deleted +0 -53

53 lines not on this page · raw message

meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch deleted +0 -41

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 deleted +0 -66

66 lines not on this page · raw message

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

41 lines not on this page · raw message

meta/recipes-devtools/mtd/mtd-utils_2.3.1.bb renamed from meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb +1 -6
similarity index 91%
rename from meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb
rename to meta/recipes-devtools/mtd/mtd-utils_2.3.1.bb
index 545f0d68d5..e831ebb1d7 100644
@@ -11,13 +11,8 @@ inherit autotools pkgconfig systemd update-alternatives
 DEPENDS = "zlib e2fsprogs util-linux"
 RDEPENDS:mtd-utils-tests += "bash"
 
-SRCREV = "4594fc1f4496a0ed55cabd31fbeba4e3fbf05602"
+SRCREV = "053ee1038e5dedae61a88cadfb7bdfe9894d8bb6"
 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 \
-           file://0001-Improve-check-for-GCC-compiler-version.patch \
            file://ubihealthd.service"
 
 # xattr support creates an additional compile-time dependency on acl because
Signature · 1 line
2.43.0