Commit 38107141 authored by Jan Čermák's avatar Jan Čermák

mtd-utils: add patch for musl build, refresh patches

parent 7d48f29c
......@@ -2,14 +2,14 @@
+++ b/Makefile
@@ -3,7 +3,7 @@
VERSION = 1.5.1
VERSION = 1.5.2
-CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS)
+CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS) -I./include/linux/lzma
ifeq ($(WITHOUT_XATTR), 1)
CPPFLAGS += -DWITHOUT_XATTR
@@ -84,7 +84,7 @@
@@ -84,7 +84,7 @@ $(BUILDDIR)/include/version.h.tmp:
#
# Utils in top level
#
......@@ -5011,7 +5011,7 @@
+}
--- a/mkfs.jffs2.c
+++ b/mkfs.jffs2.c
@@ -1658,11 +1658,11 @@ int main(int argc, char **argv)
@@ -1659,11 +1659,11 @@ int main(int argc, char **argv)
}
erase_block_size *= units;
......
diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index 8badd1f..9e63e53 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -31,7 +31,6 @@
......@@ -10,7 +8,7 @@ index 8badd1f..9e63e53 100644
#include <bits/stdio_lim.h>
#include <sys/mman.h>
#include <sys/vfs.h>
@@ -262,8 +261,6 @@ static void check_failed(const char *cond, const char *func, const char *file,
@@ -262,8 +261,6 @@ static void check_failed(const char *con
* 2. Compile with -rdynamic and -g gcc options
* 3. Preferrably compile with -O0 to avoid inlining
*/
......
diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index 9e63e53..746b84e 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -31,7 +31,6 @@
......@@ -10,11 +8,9 @@ index 9e63e53..746b84e 100644
#include <sys/mman.h>
#include <sys/vfs.h>
#include <sys/mount.h>
diff --git a/tests/jittertest/Makefile b/tests/jittertest/Makefile
index 0209c63..aba7ad8 100644
--- a/tests/jittertest/Makefile
+++ b/tests/jittertest/Makefile
@@ -30,7 +30,7 @@ JitterTest.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
@@ -30,7 +30,7 @@ JitterTest.o: /usr/include/sys/cdefs.h /
JitterTest.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
JitterTest.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
JitterTest.o: /usr/include/bits/types.h /usr/include/libio.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment