mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2025-12-10 08:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tools: mtd-utils: Update to version 2.3.0

Browse source 
See announcement mail for list of new features:
https://lists.infradead.org/pipermail/linux-mtd/2025-February/108248.html

The removed patch 100-sscanf_fix.patch was applied upstream, see:
https://git.infradead.org/?p=mtd-utils.git;a=commitdiff;h=cba2d7875328b05a4a76f619de0ce7050f2df971

The patch 110-portability.patch was manually adapted.

Cherry pick some upstream commits which fix build problems in some
situations.

Link: https://github.com/openwrt/openwrt/pull/20540
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2025-10-25 14:40:21 +02:00
parent a646a8e3e8
commit 52c0e90bdc
10 changed files with 300 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/mtd-utils/Makefile
View file

@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mtd-utils PKG_NAME:=mtd-utils
PKG_VERSION:=2.2.1 PKG_VERSION:=2.3.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://infraroot.at/pub/mtd/ PKG_SOURCE_URL:=https://infraroot.at/pub/mtd/
PKG_HASH:=f7ae20b2eb79ee83441468f0b99d897024cd96ff853eea59106fb1952065c803 PKG_HASH:=2db102908b232406ccb20719c0f43b61196aef4534493419fbf98a273c598c10
PKG_CPE_ID:=cpe:/a:mtd-utils_project:mtd-utils PKG_CPE_ID:=cpe:/a:mtd-utils_project:mtd-utils
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf

57
tools/mtd-utils/patches/001-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch Normal file
View file

@ -0,0 +1,57 @@
From 8a83b306db64d6f60186d4396b0b770163b85b6e Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Wed, 26 Feb 2025 18:24:00 +0000
Subject: ubifs-utils: link libmissing.a in case execinfo.h isn't present
On musl execinfo.h doesn't exist, but ubifs-utils uses backtrace() when
reporting errors. This results in build failures under musl.
Handily, libmissing.a already exists with a stub implementation of
backtrace().
Guard the execinfo.h include and if it isn't available instead include
libmissing.h, and link to libmissing.a to provide backtrace() if needed.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
ubifs-utils/Makemodule.am | 4 ++--
ubifs-utils/common/defs.h | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
--- a/ubifs-utils/Makemodule.am
+++ b/ubifs-utils/Makemodule.am
@@ -72,7 +72,7 @@ mkfs_ubifs_SOURCES = \
ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
mkfs_ubifs_LDADD = libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(UUID_LIBS) $(LIBSELINUX_LIBS) $(OPENSSL_LIBS) \
- $(DUMP_STACK_LD) $(ASAN_LIBS) -lm -lpthread
+ $(DUMP_STACK_LD) $(ASAN_LIBS) -lm -lpthread libmissing.a
mkfs_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS) \
-I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common -I $(top_srcdir)/ubifs-utils/libubifs
@@ -90,7 +90,7 @@ fsck_ubifs_SOURCES = \
ubifs-utils/fsck.ubifs/handle_disconnected.c
fsck_ubifs_LDADD = libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(UUID_LIBS) $(LIBSELINUX_LIBS) $(OPENSSL_LIBS) \
- $(DUMP_STACK_LD) $(ASAN_LIBS) -lm -lpthread
+ $(DUMP_STACK_LD) $(ASAN_LIBS) -lm -lpthread libmissing.a
fsck_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS) \
-I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common -I $(top_srcdir)/ubifs-utils/libubifs \
-I$(top_srcdir)/ubifs-utils/fsck.ubifs
--- a/ubifs-utils/common/defs.h
+++ b/ubifs-utils/common/defs.h
@@ -13,8 +13,11 @@
#include <errno.h>
#include <time.h>
#include <assert.h>
+#if HAVE_EXECINFO_H
#include <execinfo.h>
-
+#else
+#include "libmissing.h"
+#endif
#include "ubifs.h"
/* common.h requires the PROGRAM_NAME macro */

32
tools/mtd-utils/patches/002-ubifs-utils-common-fix-memory-leak-in-devtable.c.patch Normal file
View file

@ -0,0 +1,32 @@
From 2669111e3c60b8e146c174db5d2e7e9991f3dd87 Mon Sep 17 00:00:00 2001
From: AntonMoryakov <ant.v.moryakov@gmail.com>
Date: Thu, 24 Apr 2025 21:19:22 +0300
Subject: ubifs-utils: common: fix memory leak in devtable.c
Report of the static analyzer:
Dynamic memory, referenced by 'line', is allocated at devtable.c:356
by calling function 'getline' and lost at devtable.c:388.
(line: while (getline(&line, &len, f) != -1) {)
Correct explained:
Now line is freed in any exit scenario via out_close which eliminates this error.
Triggers found by static analyzer Svace.
Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.co
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
ubifs-utils/common/devtable.c | 1 +
1 file changed, 1 insertion(+)
--- a/ubifs-utils/common/devtable.c
+++ b/ubifs-utils/common/devtable.c
@@ -392,6 +392,7 @@ int parse_devtable(const char *tbl_file)
out_close:
fclose(f);
+ free(line);
free_devtable_info();
return -1;
}

32
tools/mtd-utils/patches/004-Improve-check-for-GCC-compiler-version.patch Normal file
View file

@ -0,0 +1,32 @@
From ac0ab65ebcd7b11739986b81343457469fbb43b0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 22 Mar 2025 21:01:32 -0700
Subject: 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.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
ubifs-utils/common/atomic.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- 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 */

45
tools/mtd-utils/patches/005-ubifs-utils-ubifs.h-Include-fcntl.h.patch Normal file
View file

@ -0,0 +1,45 @@
From 12bc9ad824bd8f18a5ec9c7154ad2374cf8c7ae3 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <festevam@gmail.com>
Date: Wed, 19 Feb 2025 10:02:41 -0300
Subject: 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
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
ubifs-utils/libubifs/ubifs.h | 1 +
1 file changed, 1 insertion(+)
--- 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"

33
tools/mtd-utils/patches/006-ubifs-utils-journal-Include-sys-stat.h.patch Normal file
View file

@ -0,0 +1,33 @@
From 173f9714c8da1d685bfa951d43b9310d16bbab3c Mon Sep 17 00:00:00 2001
From: Fabio Estevam <festevam@gmail.com>
Date: Wed, 19 Feb 2025 10:02:42 -0300
Subject: ubifs-utils: journal: Include <sys/stat.h>
Include the <sys/stat.h> header file to fix the following error
when building with musl:
| ../git/ubifs-utils/libubifs/journal.c: In function 'ubifs_get_dent_type':
| ../git/ubifs-utils/libubifs/journal.c:414:24: error: 'S_IFMT' undeclared (first use in this function)
| 414 | switch (mode & S_IFMT) {
| | ^~~~~~
| ../git/ubifs-utils/libubifs/journal.c:414:24: note: each undeclared identifier is reported only once for each function it appears in
| ../git/ubifs-utils/libubifs/journal.c:415:14: error: 'S_IFREG' undeclared (first use in this function)
| 415 | case S_IFREG:
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
ubifs-utils/libubifs/journal.c | 1 +
1 file changed, 1 insertion(+)
--- a/ubifs-utils/libubifs/journal.c
+++ b/ubifs-utils/libubifs/journal.c
@@ -46,6 +46,7 @@
* all the nodes.
*/
+#include <sys/stat.h>
#include "bitops.h"
#include "kmem.h"
#include "ubifs.h"

33
tools/mtd-utils/patches/007-ubifs-utils-extract_files-Include-linux-limits.h.patch Normal file
View file

@ -0,0 +1,33 @@
From 77981a2888c711268b0e7f32af6af159c2288e23 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <festevam@gmail.com>
Date: Wed, 19 Feb 2025 10:02:44 -0300
Subject: ubifs-utils: extract_files: Include <linux/limits.h>
Include <linux/limits.h> to fix the following build error when building
with musl:
| ../git/ubifs-utils/fsck.ubifs/extract_files.c: In function 'parse_ino_node':
| ../git/ubifs-utils/fsck.ubifs/extract_files.c:144:47: error: 'XATTR_LIST_MAX' undeclared (first use in this function)
| 144 | if (ino_node->xnms + ino_node->xcnt > XATTR_LIST_MAX) {
| | ^~~~~~~~~~~~~~
| ../git/ubifs-utils/fsck.ubifs/extract_files.c:144:47: note: each undeclared identifier is reported only once for each function it appears in
| make: *** [Makefile:4374: ubifs-utils/fsck.ubifs/fsck_ubifs-extract_files.o] Error 1
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
ubifs-utils/fsck.ubifs/extract_files.c | 2 ++
1 file changed, 2 insertions(+)
--- a/ubifs-utils/fsck.ubifs/extract_files.c
+++ b/ubifs-utils/fsck.ubifs/extract_files.c
@@ -10,6 +10,8 @@
#include <getopt.h>
#include <sys/stat.h>
+#include <linux/limits.h>
+
#include "linux_err.h"
#include "bitops.h"
#include "kmem.h"

11
tools/mtd-utils/patches/100-sscanf_fix.patch
View file

@ -1,11 +0,0 @@
--- a/jffsX-utils/mkfs.jffs2.c
+++ b/jffsX-utils/mkfs.jffs2.c
@@ -428,7 +428,7 @@ static int interpret_table_entry(struct
if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu %lu",
SCANF_STRING(name), &type, &mode, &uid, &gid, &major, &minor,
- &start, &increment, &count) < 0)
+ &start, &increment, &count) < 10)
{
return 1;
}

115
tools/mtd-utils/patches/110-portability.patch
View file

@ -48,12 +48,54 @@
/* The version of UBI images supported by this implementation */ /* The version of UBI images supported by this implementation */
#define UBI_VERSION 1 #define UBI_VERSION 1
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h --- a/ubifs-utils/common/compiler_attributes.h
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h +++ b/ubifs-utils/common/compiler_attributes.h
@@ -32,7 +32,17 @@ @@ -1,6 +1,8 @@
#include <endian.h> #ifndef __COMPILER_ATTRIBUTES_H__
#include <byteswap.h> #define __COMPILER_ATTRIBUTES_H__
#include <linux/types.h>
+#include <execinfo.h>
+
#if __has_attribute(__fallthrough__)
#define fallthrough __attribute__((__fallthrough__))
#else
@@ -11,6 +13,7 @@
#define __unused __attribute__((__unused__))
#define __const __attribute__((__const__))
#define __must_check __attribute__((__warn_unused_result__))
+#define __always_inline inline __attribute__((__always_inline__))
#ifndef __force
#define __force
#endif
--- a/ubifs-utils/common/linux_types.h
+++ b/ubifs-utils/common/linux_types.h
@@ -14,7 +14,11 @@ typedef __u16 u16;
typedef __u32 u32;
typedef __u64 u64;
+#ifdef __linux__
typedef __s64 time64_t;
+#else
+typedef int64_t time64_t;
+#endif
struct qstr {
const char *name;
@@ -89,4 +93,8 @@ static inline int int_log2(unsigned int
#undef PAGE_SHIFT
#define PAGE_SHIFT (int_log2(PAGE_SIZE))
+#ifndef EUCLEAN
+#define EUCLEAN 117 /* Structure needs cleaning */
+#endif
+
#endif
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
@@ -29,7 +29,17 @@
#include <dirent.h>
#include <crc32.h>
#include <uuid.h>
+#ifdef __linux__ +#ifdef __linux__
#include <linux/fs.h> #include <linux/fs.h>
+# if defined(__x86_64__) && defined(__ILP32__) +# if defined(__x86_64__) && defined(__ILP32__)
@ -65,12 +107,10 @@
+# endif +# endif
+# define llseek lseek +# define llseek lseek
+#endif +#endif
#include <getopt.h>
#include <sys/types.h> #include <sys/types.h>
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c #include <sys/stat.h>
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c #include <sys/ioctl.h>
@@ -1568,6 +1568,7 @@ static int add_inode(struct stat *st, in @@ -1459,6 +1469,7 @@ static int add_inode(struct stat *st, in
if (c->default_compr != UBIFS_COMPR_NONE) if (c->default_compr != UBIFS_COMPR_NONE)
use_flags |= UBIFS_COMPR_FL; use_flags |= UBIFS_COMPR_FL;
@ -78,33 +118,33 @@
if (flags & FS_COMPR_FL) if (flags & FS_COMPR_FL)
use_flags |= UBIFS_COMPR_FL; use_flags |= UBIFS_COMPR_FL;
if (flags & FS_SYNC_FL) if (flags & FS_SYNC_FL)
@@ -1580,6 +1581,7 @@ static int add_inode(struct stat *st, in @@ -1471,6 +1482,7 @@ static int add_inode(struct stat *st, in
use_flags |= UBIFS_DIRSYNC_FL; use_flags |= UBIFS_DIRSYNC_FL;
if (fctx) if (fctx)
use_flags |= UBIFS_CRYPT_FL; use_flags |= UBIFS_CRYPT_FL;
+#endif +#endif
memset(ino, 0, UBIFS_INO_NODE_SZ); memset(ino, 0, UBIFS_INO_NODE_SZ);
ino_key_init(&key, inum); ino_key_init(c, &key, inum);
@@ -1665,7 +1667,9 @@ static int add_dir_inode(const char *pat @@ -1556,7 +1568,9 @@ static int add_dir_inode(const char *pat
fd = dirfd(dir); fd = dirfd(dir);
if (fd == -1) if (fd == -1)
return sys_err_msg("dirfd failed"); return sys_errmsg("dirfd failed");
+#ifndef NO_NATIVE_SUPPORT +#ifndef NO_NATIVE_SUPPORT
if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1) if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
+#endif +#endif
flags = 0; flags = 0;
} }
@@ -1878,6 +1882,7 @@ static int add_file(const char *path_nam @@ -1772,6 +1786,7 @@ static int add_file(const char *path_nam
dn->ch.node_type = UBIFS_DATA_NODE; dn->ch.node_type = UBIFS_DATA_NODE;
key_write(&key, &dn->key); key_write(c, &key, &dn->key);
out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ; out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ;
+#ifndef NO_NATIVE_SUPPORT +#ifndef NO_NATIVE_SUPPORT
if (c->default_compr == UBIFS_COMPR_NONE && if (c->default_compr == UBIFS_COMPR_NONE &&
!c->encrypted && (flags & FS_COMPR_FL)) !c->encrypted && (flags & FS_COMPR_FL))
#ifdef WITH_LZO #ifdef WITH_LZO
@@ -1888,6 +1893,7 @@ static int add_file(const char *path_nam @@ -1782,6 +1797,7 @@ static int add_file(const char *path_nam
use_compr = UBIFS_COMPR_NONE; use_compr = UBIFS_COMPR_NONE;
#endif #endif
else else
@ -112,39 +152,16 @@
use_compr = c->default_compr; use_compr = c->default_compr;
compr_type = compress_data(buf, bytes_read, &dn->data, compr_type = compress_data(buf, bytes_read, &dn->data,
&out_len, use_compr); &out_len, use_compr);
@@ -1947,7 +1953,9 @@ static int add_non_dir(const char *path_ @@ -1841,7 +1857,9 @@ static int add_non_dir(const char *path_
if (fd == -1) if (fd == -1)
return sys_err_msg("failed to open file '%s'", return sys_errmsg("failed to open file '%s'",
path_name); path_name);
+#ifndef NO_NATIVE_SUPPORT +#ifndef NO_NATIVE_SUPPORT
if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1) if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
+#endif +#endif
flags = 0; flags = 0;
if (close(fd) == -1) if (close(fd) == -1)
return sys_err_msg("failed to close file '%s'", return sys_errmsg("failed to close file '%s'",
--- a/ubifs-utils/mkfs.ubifs/devtable.c
+++ b/ubifs-utils/mkfs.ubifs/devtable.c
@@ -135,6 +135,7 @@ static int interpret_table_entry(const c
unsigned int mode = 0755, uid = 0, gid = 0, major = 0, minor = 0;
unsigned int start = 0, increment = 0, count = 0;
+ buf[1023] = 0;
if (sscanf(line, "%1023s %c %o %u %u %u %u %u %u %u",
buf, &type, &mode, &uid, &gid, &major, &minor,
&start, &increment, &count) < 0)
@@ -145,10 +146,10 @@ static int interpret_table_entry(const c
buf, type, mode, uid, gid, major, minor, start,
increment, count);
- len = strnlen(buf, 1024);
+ len = strlen(buf);
if (len == 0)
return err_msg("empty path");
- if (len == 1024)
+ if (len == 1023)
return err_msg("too long path");
if (buf[0] != '/')
--- a/include/common.h --- a/include/common.h
+++ b/include/common.h +++ b/include/common.h
@@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@
@ -155,9 +172,9 @@
#include <inttypes.h> #include <inttypes.h>
#include <unistd.h> #include <unistd.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
--- a/include/mtd/ubifs-media.h --- a/ubifs-utils/libubifs/ubifs-media.h
+++ b/include/mtd/ubifs-media.h +++ b/ubifs-utils/libubifs/ubifs-media.h
@@ -33,7 +33,15 @@ @@ -33,7 +33,11 @@
#ifndef __UBIFS_MEDIA_H__ #ifndef __UBIFS_MEDIA_H__
#define __UBIFS_MEDIA_H__ #define __UBIFS_MEDIA_H__
@ -165,10 +182,6 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
+#else +#else
+#include <stdint.h> +#include <stdint.h>
+typedef uint8_t __u8;
+typedef uint16_t __be16;
+typedef uint32_t __be32;
+typedef uint64_t __be64;
+#endif +#endif
/* UBIFS node magic number (must not have the padding byte first or last) */ /* UBIFS node magic number (must not have the padding byte first or last) */

4
tools/mtd-utils/patches/130-lzma_jffs2.patch
View file

@ -5055,7 +5055,7 @@
AC_ARG_WITH([selinux], AC_ARG_WITH([selinux],
[AS_HELP_STRING([--with-selinux], [AS_HELP_STRING([--with-selinux],
[Support for selinux extended attributes])], [Support for selinux extended attributes])],
@@ -269,6 +273,7 @@ fi @@ -283,6 +287,7 @@ fi
AM_CONDITIONAL([WITH_LZO], [test "x$with_lzo" = "xyes"]) AM_CONDITIONAL([WITH_LZO], [test "x$with_lzo" = "xyes"])
AM_CONDITIONAL([WITH_ZLIB], [test "x$with_zlib" = "xyes"]) AM_CONDITIONAL([WITH_ZLIB], [test "x$with_zlib" = "xyes"])
AM_CONDITIONAL([WITH_ZSTD], [test "x$with_zstd" = "xyes"]) AM_CONDITIONAL([WITH_ZSTD], [test "x$with_zstd" = "xyes"])
@ -5063,7 +5063,7 @@
AM_CONDITIONAL([WITH_XATTR], [test "x$with_xattr" = "xyes"]) AM_CONDITIONAL([WITH_XATTR], [test "x$with_xattr" = "xyes"])
AM_CONDITIONAL([WITH_SELINUX], [test "x$with_selinux" = "xyes"]) AM_CONDITIONAL([WITH_SELINUX], [test "x$with_selinux" = "xyes"])
AM_CONDITIONAL([WITH_CRYPTO], [test "x$with_crypto" = "xyes"]) AM_CONDITIONAL([WITH_CRYPTO], [test "x$with_crypto" = "xyes"])
@@ -313,6 +318,7 @@ AC_MSG_RESULT([ @@ -339,6 +344,7 @@ AC_MSG_RESULT([
lzo support: ${with_lzo} lzo support: ${with_lzo}
zlib support: ${with_zlib} zlib support: ${with_zlib}
zstd support: ${with_zstd} zstd support: ${with_zstd}