summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/squashfs-tools/squashfs-tools
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-10-26 23:42:13 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-28 05:31:42 +0000
commitcedd55fc3e6e64c9b8b9ed76325721a6256727ba (patch)
tree3636da5d4ec5d1c517a93109b28dd9524aa6c613 /meta/recipes-devtools/squashfs-tools/squashfs-tools
parent8a1e7bd5dc9bbf7531fcc66427847448c71ec64c (diff)
downloadpoky-cedd55fc3e6e64c9b8b9ed76325721a6256727ba.tar.gz
squashfs-tools: Upgrade to 4.4
Patch for issue fixed upstream removed. (From OE-Core rev: a29889c1f5e98b84c87522c6e0a058da262153e1) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/squashfs-tools/squashfs-tools')
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-tools-4.3-sysmacros.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-tools-4.3-sysmacros.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-tools-4.3-sysmacros.patch
deleted file mode 100644
index f2e88f416a..0000000000
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-tools-4.3-sysmacros.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch
2
3Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
4
5Upstream-Status: Pending
6
7
8sys/types.h might not always include sys/sysmacros.h for major/minor/makedev
9
10--- a/squashfs-tools/mksquashfs.c
11+++ b/squashfs-tools/mksquashfs.c
12@@ -59,6 +59,7 @@
13 #else
14 #include <endian.h>
15 #include <sys/sysinfo.h>
16+#include <sys/sysmacros.h>
17 #endif
18
19 #include "squashfs_fs.h"
20--- a/squashfs-tools/unsquashfs.c
21+++ b/squashfs-tools/unsquashfs.c
22@@ -40,6 +40,10 @@
23 #include <limits.h>
24 #include <ctype.h>
25
26+#ifdef linux
27+#include <sys/sysmacros.h>
28+#endif
29+
30 struct cache *fragment_cache, *data_cache;
31 struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
32 pthread_t *thread, *inflator_thread;