Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
47
bsp/buildroot/package/squashfs/0001-include-sysmacros.patch
Normal file
47
bsp/buildroot/package/squashfs/0001-include-sysmacros.patch
Normal file
@@ -0,0 +1,47 @@
|
||||
From 968aa53dd6d2c0831a9af01873441767c06b88d0 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
||||
Date: Wed, 1 Aug 2018 12:17:10 +0200
|
||||
Subject: [PATCH] mksquashfs/unsquashfs: fix compilation with glibc 2.25+
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
From glibc 2.25 release notes:
|
||||
https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
|
||||
"* The inclusion of <sys/sysmacros.h> by <sys/types.h> is deprecated.
|
||||
This means that in a future release, the macros “major”, “minor”, and
|
||||
“makedev” will only be available from <sys/sysmacros.h>."
|
||||
|
||||
See glibc bug https://sourceware.org/bugzilla/show_bug.cgi?id=19239 .
|
||||
|
||||
Fetch from: https://github.com/plougher/squashfs-tools/pull/52.patch
|
||||
Signed-off-by: Richard Kunze <richard.kunze@web.de>
|
||||
---
|
||||
squashfs-tools/mksquashfs.c | 1 +
|
||||
squashfs-tools/unsquashfs.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
|
||||
index d696a51..8d57c3e 100644
|
||||
--- a/squashfs-tools/mksquashfs.c
|
||||
+++ b/squashfs-tools/mksquashfs.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <stddef.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <dirent.h>
|
||||
diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
|
||||
index a57f85c..a492b27 100644
|
||||
--- a/squashfs-tools/unsquashfs.c
|
||||
+++ b/squashfs-tools/unsquashfs.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "fnmatch_compat.h"
|
||||
|
||||
#include <sys/sysinfo.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
@@ -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;
|
||||
@@ -1,2 +1,5 @@
|
||||
# Locally computed
|
||||
sha256 2c49392816615b73bf5d6cdce9776cb66a01f5a1494b1d9af580667e32bab001 squashfs-3de1687d7432ea9b302c2db9521996f506c140a3.tar.gz
|
||||
sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
||||
@@ -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 = GPLv2+
|
||||
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
|
||||
@@ -50,16 +50,17 @@ HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz
|
||||
|
||||
HOST_SQUASHFS_MAKE_ARGS = \
|
||||
XATTR_SUPPORT=1 \
|
||||
XZ_SUPPORT=1 \
|
||||
GZIP_SUPPORT=1 \
|
||||
LZ4_SUPPORT=1 \
|
||||
LZO_SUPPORT=1 \
|
||||
LZMA_XZ_SUPPORT=1
|
||||
XZ_SUPPORT=1 \
|
||||
GZIP_SUPPORT=1 \
|
||||
LZ4_SUPPORT=1 \
|
||||
LZO_SUPPORT=1 \
|
||||
LZMA_XZ_SUPPORT=1 \
|
||||
ZSTD_SUPPORT=0
|
||||
|
||||
define SQUASHFS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
CC="$(TARGET_CC)" \
|
||||
EXTRA_CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
CC="$(TARGET_CC)" \
|
||||
EXTRA_CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline" \
|
||||
EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
$(SQUASHFS_MAKE_ARGS) \
|
||||
-C $(@D)/squashfs-tools/
|
||||
@@ -73,7 +74,7 @@ endef
|
||||
define HOST_SQUASHFS_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) \
|
||||
CC="$(HOSTCC)" \
|
||||
EXTRA_CFLAGS="$(HOST_CFLAGS)" \
|
||||
EXTRA_CFLAGS="$(HOST_CFLAGS)" \
|
||||
EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
|
||||
$(HOST_SQUASHFS_MAKE_ARGS) \
|
||||
-C $(@D)/squashfs-tools/
|
||||
@@ -81,7 +82,7 @@ endef
|
||||
|
||||
define HOST_SQUASHFS_INSTALL_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
|
||||
-C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
|
||||
-C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/bin install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user