diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-12-11 19:21:43 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-12-11 19:21:43 +0000 |
| commit | d437c72c216b45aa27187bbfddbf43fafdc0b5fe (patch) | |
| tree | b0ccfca82d2fc7fa0d5c747a303b10e3a376b86f | |
| parent | e5c1cc55453169bcfc8623cf498e1f6485669246 (diff) | |
| download | upstream-d437c72c216b45aa27187bbfddbf43fafdc0b5fe.tar.gz upstream-d437c72c216b45aa27187bbfddbf43fafdc0b5fe.tar.bz2 upstream-d437c72c216b45aa27187bbfddbf43fafdc0b5fe.zip | |
tools/squashfs4: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47869
4 files changed, 9 insertions, 13 deletions
diff --git a/tools/squashfs4/patches/160-expose_lzma_xz_options.patch b/tools/squashfs4/patches/160-expose_lzma_xz_options.patch index d6063969d2..2fbd954859 100644 --- a/tools/squashfs4/patches/160-expose_lzma_xz_options.patch +++ b/tools/squashfs4/patches/160-expose_lzma_xz_options.patch @@ -637,7 +637,7 @@ } name = argv[1]; -@@ -76,190 +73,50 @@ static int xz_options(char *argv[], int +@@ -76,190 +73,50 @@ static int xz_options(char *argv[], int } if(bcj[i].name == NULL) { fprintf(stderr, "xz: -Xbcj unrecognised " @@ -864,7 +864,7 @@ SQUASHFS_METADATA_SIZE; filter[0].filter[0].id = LZMA_FILTER_LZMA2; -@@ -323,14 +181,25 @@ static int xz_compress(void *strm, void +@@ -323,14 +181,25 @@ static int xz_compress(void *strm, void lzma_ret res = 0; struct xz_stream *stream = strm; struct filter *selected = NULL; diff --git a/tools/squashfs4/patches/180-openbsd_compat.patch b/tools/squashfs4/patches/180-openbsd_compat.patch index 6d7a857a05..b9c1b5925d 100644 --- a/tools/squashfs4/patches/180-openbsd_compat.patch +++ b/tools/squashfs4/patches/180-openbsd_compat.patch @@ -1,6 +1,5 @@ -diff -Nur squashfs4.2.orig/squashfs-tools/mksquashfs.c squashfs4.2/squashfs-tools/mksquashfs.c ---- squashfs4.2.orig/squashfs-tools/mksquashfs.c Tue Mar 5 16:20:49 2013 -+++ squashfs4.2/squashfs-tools/mksquashfs.c Tue Mar 5 16:25:10 2013 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c @@ -32,6 +32,9 @@ #include <stdio.h> #include <stddef.h> @@ -11,9 +10,8 @@ diff -Nur squashfs4.2.orig/squashfs-tools/mksquashfs.c squashfs4.2/squashfs-tool #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -diff -Nur squashfs4.2.orig/squashfs-tools/unsquashfs.h squashfs4.2/squashfs-tools/unsquashfs.h ---- squashfs4.2.orig/squashfs-tools/unsquashfs.h Tue Mar 5 16:20:49 2013 -+++ squashfs4.2/squashfs-tools/unsquashfs.h Tue Mar 5 16:25:57 2013 +--- a/squashfs-tools/unsquashfs.h ++++ b/squashfs-tools/unsquashfs.h @@ -25,6 +25,9 @@ #define TRUE 1 #define FALSE 0 diff --git a/tools/squashfs4/patches/190-no_nonstatic_inline.patch b/tools/squashfs4/patches/190-no_nonstatic_inline.patch index 7b5808afab..27ebc6a263 100644 --- a/tools/squashfs4/patches/190-no_nonstatic_inline.patch +++ b/tools/squashfs4/patches/190-no_nonstatic_inline.patch @@ -1,6 +1,6 @@ --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c -@@ -735,13 +735,13 @@ void cache_block_put(struct file_buffer +@@ -735,13 +735,13 @@ void cache_block_put(struct file_buffer + (((char *)A) - data_cache))) diff --git a/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch b/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch index 7ac1765eed..5cec51f7b7 100644 --- a/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch +++ b/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch @@ -1,7 +1,5 @@ -Index: squashfs4.2/squashfs-tools/mksquashfs.c -=================================================================== ---- squashfs4.2.orig/squashfs-tools/mksquashfs.c -+++ squashfs4.2/squashfs-tools/mksquashfs.c +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c @@ -175,6 +175,9 @@ unsigned int cache_bytes = 0, cache_size /* inode lookup table */ squashfs_inode *inode_lookup_table = NULL; |