Update buildroot & docker (#25)

* Update docker & buildroot

* Fix

* fix versions
This commit is contained in:
Pascal Vizeli
2018-05-28 14:58:22 +02:00
committed by GitHub
parent 7db3226a8e
commit b13086072c
1887 changed files with 22062 additions and 18015 deletions

View File

@@ -0,0 +1,32 @@
From 8da4dde42cc25294819ad078432d85437e4a12ee Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sun, 22 Apr 2018 15:05:46 +0200
Subject: [PATCH] pktsetup/pktsetup.c: do not include <bits/types.h>
This header is not a standard header, and is for example not provided
by the musl C library.
This change has been tested by building udftools against glibc, uClibc
and musl.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Upstream-status: https://github.com/pali/udftools/pull/16
---
pktsetup/pktsetup.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/pktsetup/pktsetup.c b/pktsetup/pktsetup.c
index 8b3df51..81ed142 100644
--- a/pktsetup/pktsetup.c
+++ b/pktsetup/pktsetup.c
@@ -27,7 +27,6 @@
#include <sys/stat.h>
#include <unistd.h>
#include <getopt.h>
-#include <bits/types.h>
#include <sys/types.h>
#include <string.h>
#include <limits.h>
--
2.14.3

View File

@@ -0,0 +1,60 @@
From bdacf0101fea1dad2c89996b27cb4b9caee9109c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sun, 22 Apr 2018 22:28:09 +0200
Subject: [PATCH] configure.ac: detect readline via pkg-config when possible
pkg-config automatically handles static linking situations, where for
example readline is linked against ncurses, and therefore -lncurses
needs to be passed in addition to -lreadline.
This proposal uses pkg-config when available. If pkg-config is not
found, or readline is not found via pkg-config, we fallback to the
existing AC_CHECK_LIB(). This AC_CHECK_LIB() test is modified to set
READLINE_LIBS, like PKG_CHECK_MODULES() does. The Makefile.am
consequently uses READLINE_LIBS instead of hardcoding -lreadline.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
configure.ac | 14 ++++++++++++--
wrudf/Makefile.am | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 95fbba3..62b1caa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,18 @@ AC_PROG_CC
AC_DISABLE_SHARED
AM_PROG_LIBTOOL
-dnl Checks for libraries.
-AC_CHECK_LIB(readline, readline, [ ], AC_MSG_ERROR([cannot find -lreadline.]))
+PKG_PROG_PKG_CONFIG
+
+dnl Checks for libraries, by using pkg-config when available
+if test -n "${PKG_CONFIG}" ; then
+ PKG_CHECK_MODULES([READLINE], [readline], [readline_found=yes], [readline_found=no])
+fi
+
+if test "${readline_found}" != "yes" ; then
+ AC_CHECK_LIB(readline, readline,
+ [AC_SUBST([READLINE_LIBS], [-lreadline])],
+ AC_MSG_ERROR([cannot find -lreadline.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
diff --git a/wrudf/Makefile.am b/wrudf/Makefile.am
index fe1c269..e3ab85b 100644
--- a/wrudf/Makefile.am
+++ b/wrudf/Makefile.am
@@ -1,5 +1,5 @@
bin_PROGRAMS = wrudf
-wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline
+wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la $(READLINE_LIBS)
wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
AM_CPPFLAGS = -I$(top_srcdir)/include -D_GNU_SOURCE -DDEBUG
--
2.14.3

View File

@@ -0,0 +1,12 @@
config BR2_PACKAGE_UDFTOOLS
bool "udftools"
depends on BR2_USE_WCHAR
select BR2_PACKAGE_READLINE
help
Tools for creating UDF filesystems
Maintained fork of the 2004 Sourcforge package
https://github.com/pali/udftools
comment "udftools needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR

View File

@@ -0,0 +1,3 @@
# Locally computed
sha256 67fe428d452901215cfad8049d250540c97114b1a20dd63277b91c2c4fae8292 udftools-2.0.tar.gz
sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING

View File

@@ -0,0 +1,14 @@
################################################################################
#
# udftools
#
################################################################################
UDFTOOLS_VERSION = 2.0
UDFTOOLS_SITE = https://github.com/pali/udftools/releases/download/$(UDFTOOLS_VERSION)
UDFTOOLS_LICENSE = GPL-2.0+
UDFTOOLS_LICENSE_FILES = COPYING
UDFTOOLS_AUTORECONF = YES
UDFTOOLS_DEPENDENCIES = readline host-pkgconf
$(eval $(autotools-package))