mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 09:32:14 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
8a1e7bd5dc
commit
cedd55fc3e
@@ -1,32 +0,0 @@
|
||||
From https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
|
||||
sys/types.h might not always include sys/sysmacros.h for major/minor/makedev
|
||||
|
||||
--- a/squashfs-tools/mksquashfs.c
|
||||
+++ b/squashfs-tools/mksquashfs.c
|
||||
@@ -59,6 +59,7 @@
|
||||
#else
|
||||
#include <endian.h>
|
||||
#include <sys/sysinfo.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#endif
|
||||
|
||||
#include "squashfs_fs.h"
|
||||
--- a/squashfs-tools/unsquashfs.c
|
||||
+++ b/squashfs-tools/unsquashfs.c
|
||||
@@ -40,6 +40,10 @@
|
||||
#include <limits.h>
|
||||
#include <ctype.h>
|
||||
|
||||
+#ifdef linux
|
||||
+#include <sys/sysmacros.h>
|
||||
+#endif
|
||||
+
|
||||
struct cache *fragment_cache, *data_cache;
|
||||
struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
|
||||
pthread_t *thread, *inflator_thread;
|
||||
@@ -5,10 +5,9 @@ SECTION = "base"
|
||||
LICENSE = "GPL-2"
|
||||
LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
PV = "4.3+gitr${SRCPV}"
|
||||
SRCREV = "f95864afe8833fe3ad782d714b41378e860977b1"
|
||||
PV = "4.4"
|
||||
SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
|
||||
SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
|
||||
file://squashfs-tools-4.3-sysmacros.patch;striplevel=2 \
|
||||
"
|
||||
SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759"
|
||||
SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e"
|
||||
|
||||
Reference in New Issue
Block a user