Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,20 +0,0 @@
|
||||
Fix musl build
|
||||
|
||||
Add missing header needed for ssize_t.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Patch status: posted upstream
|
||||
(http://lists.gnu.org/archive/html/bug-xorriso/2016-05/msg00000.html)
|
||||
|
||||
diff -Nuar xorriso-1.4.2-orig/libisofs/aaip_0_2.h xorriso-1.4.2/libisofs/aaip_0_2.h
|
||||
--- xorriso-1.4.2-orig/libisofs/aaip_0_2.h 2015-11-28 16:41:33.000000000 +0200
|
||||
+++ xorriso-1.4.2/libisofs/aaip_0_2.h 2016-05-24 11:40:43.874191174 +0300
|
||||
@@ -16,6 +16,7 @@
|
||||
#ifndef Aaip_h_is_includeD
|
||||
#define Aaip_h_is_includeD yes
|
||||
|
||||
+#include <unistd.h>
|
||||
|
||||
/* --------------------------------- Encoder ---------------------------- */
|
||||
|
||||
33
bsp/buildroot/package/xorriso/0001-use-sys-xattr.h.patch
Normal file
33
bsp/buildroot/package/xorriso/0001-use-sys-xattr.h.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
Use system <sys/xattr.h>
|
||||
|
||||
The one from attr is no longer installed with latest version.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
---
|
||||
Upstream status: alternate, more complex patch pending...
|
||||
|
||||
diff -durN xorriso-1.4.6.orig/configure.ac xorriso-1.4.6/configure.ac
|
||||
--- xorriso-1.4.6.orig/configure.ac 2016-09-16 15:51:33.000000000 +0200
|
||||
+++ xorriso-1.4.6/configure.ac 2018-05-06 23:45:38.377153069 +0200
|
||||
@@ -264,7 +264,7 @@
|
||||
dnl Check whether there is the header for Linux xattr.
|
||||
dnl If not, erase this macro which would enable use of listxattr and others
|
||||
XATTR_DEF="-DLibisofs_with_aaip_xattR"
|
||||
- AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
|
||||
+ AC_CHECK_HEADER(sys/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
|
||||
XATTR_DEF= ), XATTR_DEF= )
|
||||
fi
|
||||
elif test x"$LIBBURNIA_SUPP_FATTR" = xextattr
|
||||
diff -durN xorriso-1.4.6.orig/libisofs/aaip-os-linux.c xorriso-1.4.6/libisofs/aaip-os-linux.c
|
||||
--- xorriso-1.4.6.orig/libisofs/aaip-os-linux.c 2016-09-16 15:51:34.000000000 +0200
|
||||
+++ xorriso-1.4.6/libisofs/aaip-os-linux.c 2018-05-06 23:47:25.764941583 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef Libisofs_with_aaip_xattR
|
||||
-#include <attr/xattr.h>
|
||||
+#include <sys/xattr.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
config BR2_PACKAGE_XORRISO
|
||||
bool "xorriso"
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
xorriso copies file objects from POSIX compliant
|
||||
filesystems into Rock Ridge enhanced ISO 9660 filesystems
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 2843beded1aa4c678706e96fdf9cc5e4b34430b559bdf5bc35df5202125004b3 xorriso-1.4.2.tar.gz
|
||||
sha256 526f728c7eee6f8c4b69fbf391789e6c80806197c2861cf5922cf7cfe1035784 xorriso-1.4.6.tar.gz
|
||||
|
||||
@@ -4,10 +4,23 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XORRISO_VERSION = 1.4.2
|
||||
XORRISO_VERSION = 1.4.6
|
||||
XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso
|
||||
XORRISO_LICENSE = GPLv3+
|
||||
XORRISO_LICENSE = GPL-3.0+
|
||||
XORRISO_LICENSE_FILES = COPYING COPYRIGHT
|
||||
|
||||
# 0001-use-sys-xattr.h.patch
|
||||
XORRISO_DEPENDENCIES = host-pkgconf
|
||||
HOST_XORRISO_DEPENDENCIES = host-pkgconf
|
||||
XORRISO_AUTORECONF = YES
|
||||
|
||||
# Make autoreconf happy
|
||||
define XORRISO_NEWS
|
||||
touch $(@D)/NEWS
|
||||
endef
|
||||
XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS
|
||||
HOST_XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS
|
||||
|
||||
# Disable everything until we actually need those features, and add the correct
|
||||
# host libraries
|
||||
HOST_XORRISO_CONF_OPTS = \
|
||||
@@ -18,19 +31,14 @@ HOST_XORRISO_CONF_OPTS = \
|
||||
--disable-libedit \
|
||||
--disable-libacl
|
||||
|
||||
# libcdio doesn't make sense for Linux
|
||||
# http://lists.gnu.org/archive/html/bug-xorriso/2017-04/msg00004.html
|
||||
XORRISO_CONF_OPTS = --disable-libcdio
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
XORRISO_DEPENDENCIES += libiconv
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCDIO),y)
|
||||
XORRISO_DEPENDENCIES += host-pkgconf libcdio
|
||||
XORRISO_CONF_OPTS += \
|
||||
--enable-pkg-check-modules \
|
||||
--enable-libcdio
|
||||
else
|
||||
XORRISO_CONF_OPTS += --disable-libcdio
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
XORRISO_DEPENDENCIES += readline
|
||||
XORRISO_CONF_OPTS += --enable-libreadline
|
||||
|
||||
Reference in New Issue
Block a user