EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools/squashfs4: refresh patches

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47869
This commit is contained in:
Felix Fietkau 2015-12-11 19:21:43 +00:00
parent e5c1cc5545
commit d437c72c21
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/squashfs4/patches/160-expose_lzma_xz_options.patch
View File

@ -637,7 +637,7 @@
} }
name = argv[1]; 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) { if(bcj[i].name == NULL) {
fprintf(stderr, "xz: -Xbcj unrecognised " fprintf(stderr, "xz: -Xbcj unrecognised "
@ -864,7 +864,7 @@
SQUASHFS_METADATA_SIZE; SQUASHFS_METADATA_SIZE;
filter[0].filter[0].id = LZMA_FILTER_LZMA2; 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; lzma_ret res = 0;
struct xz_stream *stream = strm; struct xz_stream *stream = strm;
struct filter *selected = NULL; struct filter *selected = NULL;

10
tools/squashfs4/patches/180-openbsd_compat.patch
View File

@ -1,6 +1,5 @@
diff -Nur squashfs4.2.orig/squashfs-tools/mksquashfs.c squashfs4.2/squashfs-tools/mksquashfs.c --- a/squashfs-tools/mksquashfs.c
--- squashfs4.2.orig/squashfs-tools/mksquashfs.c Tue Mar 5 16:20:49 2013 +++ b/squashfs-tools/mksquashfs.c
+++ squashfs4.2/squashfs-tools/mksquashfs.c Tue Mar 5 16:25:10 2013
@@ -32,6 +32,9 @@ @@ -32,6 +32,9 @@
#include <stdio.h> #include <stdio.h>
#include <stddef.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/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
diff -Nur squashfs4.2.orig/squashfs-tools/unsquashfs.h squashfs4.2/squashfs-tools/unsquashfs.h --- a/squashfs-tools/unsquashfs.h
--- squashfs4.2.orig/squashfs-tools/unsquashfs.h Tue Mar 5 16:20:49 2013 +++ b/squashfs-tools/unsquashfs.h
+++ squashfs4.2/squashfs-tools/unsquashfs.h Tue Mar 5 16:25:57 2013
@@ -25,6 +25,9 @@ @@ -25,6 +25,9 @@
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0

2
tools/squashfs4/patches/190-no_nonstatic_inline.patch
View File

@ -1,6 +1,6 @@
--- a/squashfs-tools/mksquashfs.c --- a/squashfs-tools/mksquashfs.c
+++ b/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))) + (((char *)A) - data_cache)))

6
tools/squashfs4/patches/200-add-fixed-timestamp-option.patch
View File

@ -1,7 +1,5 @@
Index: squashfs4.2/squashfs-tools/mksquashfs.c --- a/squashfs-tools/mksquashfs.c
=================================================================== +++ b/squashfs-tools/mksquashfs.c
--- squashfs4.2.orig/squashfs-tools/mksquashfs.c
+++ squashfs4.2/squashfs-tools/mksquashfs.c
@@ -175,6 +175,9 @@ unsigned int cache_bytes = 0, cache_size @@ -175,6 +175,9 @@ unsigned int cache_bytes = 0, cache_size
/* inode lookup table */ /* inode lookup table */
squashfs_inode *inode_lookup_table = NULL; squashfs_inode *inode_lookup_table = NULL;