deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

squashfs: bump version to e38956b92f738518c29734399629e7cdb33072d3

Browse source 
- delete patch 0001-musl.patch (superseeded by upstream commit [1])
- disable new zstd support for host/target

[1] https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git/commit/?id=a81678d6a698b8a016f9abac9f3d981281cc52eb

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Peter Seiderer 2018-04-09 22:04:24 +02:00 committed by Thomas Petazzoni
parent af4361a67a
commit 50b1a05fb6
3 changed files with 5 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
package/squashfs/0001-musl.patch
View file

@ -1,71 +0,0 @@
Fix musl build
Downloaded from
http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
and adjusted paths.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Define FNM_EXTMATCH if not defined its glibc specific define
include missing sys/stat.h for stat* function declarations
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: squashfs-tools/action.c
===================================================================
--- a/squashfs-tools.orig/action.c
+++ b/squashfs-tools/action.c
@@ -44,6 +44,10 @@
#include "action.h"
#include "error.h"
+#if !defined(FNM_EXTMATCH)
+#define FNM_EXTMATCH 0
+#endif
+
/*
* code to parse actions
*/
Index: squashfs-tools/mksquashfs.c
===================================================================
--- a/squashfs-tools.orig/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st
dir_size + 3, directory_block, directory_offset, NULL, NULL,
dir, 0);
+#if !defined(FNM_EXTMATCH)
+#define FNM_EXTMATCH 0
+#endif
+
#ifdef SQUASHFS_TRACE
{
unsigned char *dirp;
Index: squashfs-tools/pseudo.c
===================================================================
--- a/squashfs-tools.orig/pseudo.c
+++ b/squashfs-tools/pseudo.c
@@ -32,6 +32,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <sys/stat.h>
#include <ctype.h>
#include "pseudo.h"
Index: squashfs-tools/unsquashfs.c
===================================================================
--- a/squashfs-tools.orig/unsquashfs.c
+++ b/squashfs-tools/unsquashfs.c
@@ -38,6 +38,10 @@
#include <limits.h>
#include <ctype.h>
+#ifndef FNM_EXTMATCH
+#define FNM_EXTMATCH 0
+#endif
+
struct cache *fragment_cache, *data_cache;
struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
pthread_t *thread, *inflator_thread;

2
package/squashfs/squashfs.hash
View file

@ -1,2 +1,2 @@
# Locally computed
sha256 2c49392816615b73bf5d6cdce9776cb66a01f5a1494b1d9af580667e32bab001 squashfs-3de1687d7432ea9b302c2db9521996f506c140a3.tar.gz
sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz

7
package/squashfs/squashfs.mk
View file

@ -4,12 +4,12 @@
#
################################################################################
SQUASHFS_VERSION = 3de1687d7432ea9b302c2db9521996f506c140a3
SQUASHFS_VERSION = e38956b92f738518c29734399629e7cdb33072d3
SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
SQUASHFS_SITE_METHOD = git
SQUASHFS_LICENSE = GPL-2.0+
SQUASHFS_LICENSE_FILES = COPYING
SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ZSTD_SUPPORT=0
ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
SQUASHFS_DEPENDENCIES += lz4
@ -54,7 +54,8 @@ HOST_SQUASHFS_MAKE_ARGS = \
GZIP_SUPPORT=1 \
LZ4_SUPPORT=1 \
LZO_SUPPORT=1 \
LZMA_XZ_SUPPORT=1
LZMA_XZ_SUPPORT=1 \
ZSTD_SUPPORT=0
define SQUASHFS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) \