summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/squashfs-tools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/squashfs-tools')
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-tools-4.3-sysmacros.patch32
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb5
2 files changed, 2 insertions, 35 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;
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index 51e4a5939d..53d3787271 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -5,10 +5,9 @@ SECTION = "base"
5LICENSE = "GPL-2" 5LICENSE = "GPL-2"
6LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 6LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8PV = "4.3+gitr${SRCPV}" 8PV = "4.4"
9SRCREV = "f95864afe8833fe3ad782d714b41378e860977b1" 9SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
10SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ 10SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
11 file://squashfs-tools-4.3-sysmacros.patch;striplevel=2 \
12" 11"
13SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759" 12SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759"
14SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e" 13SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e"