rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update buidlroot to version 2016.08.1

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 22:07:29 +01:00
parent 807ab03547
commit a1061efbc2
3636 changed files with 59539 additions and 25783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
bsp/buildroot/package/lirc-tools/0001-lib-use-proper-linking-method-to-avoid-parallel-buil.patch Normal file
View File

@@ -0,0 +1,46 @@
From f2fc8c48e5e55a91b309225f377b6cb3783fc6f6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 25 May 2016 15:21:57 +0200
Subject: [PATCH] lib: use proper linking method to avoid parallel build issue
Using <foo>_LDFLAGS = -l<library> is correct when <library> is an
external library. However, when it is built by the same package, and
especially in the same directory, this is wrong and can cause parallel
build issues. In lib/Makefile.am, there was:
libirrecord_la_LDFLAGS = -llirc
But the liblirc library is built in the same directory. Or, due to the
using of <foo>_LDFLAGS, make is not aware of the build dependency
between libirrecord and liblirc.
To solve this, <foo>_LIBADD should be used instead, as follows:
libirrecord_la_LIBADD = liblirc.la
This fixes parallel build issues seen by automated build tests
conducted by the Buildroot project, such as:
http://autobuild.buildroot.org/results/eb4/eb47d57de8182d25b1dacbf0ac3726ed20063d04/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
lib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ce5c94c..8780f88 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,7 +29,7 @@ liblirc_la_SOURCES = config_file.c \
transmit.c \
util.c
-libirrecord_la_LDFLAGS = -llirc
+libirrecord_la_LIBADD = liblirc.la
libirrecord_la_SOURCES = irrecord.c
liblirc_client_la_LDFLAGS = -version-info 4:0:4
--
2.7.4

46
bsp/buildroot/package/lirc-tools/0001-tools-Make-make_rel_symlink.py-use-python3.patch
View File

@@ -1,46 +0,0 @@
From ae2e8cc85b6b4d2202e42d704dde8757ffd31da6 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 11 Dec 2014 04:44:49 +0100
Subject: [PATCH] tools: Make make_rel_symlink.py use python3.
Upstream patch:
http://sourceforge.net/p/lirc/git/ci/ae2e8cc85b6b4d2202e42d704dde8757ffd31da6/
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
tools/make_rel_symlink.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
index 5c893056f379..896637ff93e0 100755
--- a/tools/make_rel_symlink.py
+++ b/tools/make_rel_symlink.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import os.path
@@ -32,16 +32,16 @@ if sys.argv[1] == "-p":
sys.argv = sys.argv[ 1:]
if len( sys.argv ) != 3:
- print USAGE
+ print(USAGE)
sys.exit( 1 )
if os.path.isdir( sys.argv[2] ):
- print "Removing link target dir:" + sys.argv[2]
+ print("Removing link target dir:" + sys.argv[2])
shutil.rmtree( sys.argv[2])
link_path = relative_ln_s( sys.argv[1], sys.argv[2] )
if just_print:
- print link_path
+ print(link_path)
else:
os.chdir( os.path.dirname( sys.argv[2]))
target = os.path.basename( sys.argv[2])
--
2.1.4

54
bsp/buildroot/package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch Normal file
View File

@@ -0,0 +1,54 @@
From f346045e0f63289909322a3264e69b967a911636 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 24 May 2016 19:56:09 +0200
Subject: [PATCH] Don't build commandir unless we have usb.h (#191).
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
(backported from git master:
https://sourceforge.net/p/lirc/git/ci/f346045e0f63289909322a3264e69b967a911636/tree/plugins/Makefile.am?diff=4b26eb383291576b3f56820c6cec5f6a75814807)
---
plugins/Makefile.am | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 3bd89ed..2116658 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = pluginlist.am make-pluginlist.sh
plugin_LTLIBRARIES =
if BUILD_USB
+
plugin_LTLIBRARIES += atilibusb.la
atilibusb_la_SOURCES = atilibusb.c
atilibusb_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@
@@ -33,6 +34,14 @@ plugin_LTLIBRARIES += srm7500libusb.la
srm7500libusb_la_SOURCES = srm7500libusb.c
srm7500libusb_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@
srm7500libusb_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
+
+if !BSD
+plugin_LTLIBRARIES += commandir.la
+commandir_la_SOURCES = commandir.c
+commandir_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@
+commandir_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
+endif
+
endif
if BUILD_FTDI
@@ -99,11 +108,6 @@ if !BSD
plugin_LTLIBRARIES += default.la
default_la_SOURCES = default.c
-plugin_LTLIBRARIES += commandir.la
-commandir_la_SOURCES = commandir.c
-commandir_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@
-commandir_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
-
plugin_LTLIBRARIES += hiddev.la
hiddev_la_SOURCES = hiddev.c
--
2.8.1

49
bsp/buildroot/package/lirc-tools/0003-Fix-loglevel-redefinition-in-static-library-builds.patch
View File

@@ -1,49 +0,0 @@
From 2a789161ef17ac1cedd9a4eb11423f6c1020d8d9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 17 May 2015 16:08:15 +0200
Subject: [PATCH] Fix loglevel redefinition in static library builds
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
daemons/lircmd.c | 1 -
tools/irrecord.c | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/daemons/lircmd.c b/daemons/lircmd.c
index 023777c..e69078c 100644
--- a/daemons/lircmd.c
+++ b/daemons/lircmd.c
@@ -67,7 +67,6 @@ typedef uint64_t __u64;
static int uinputfd = -1;
static int useuinput = 0;
-loglevel_t loglevel = 0;
static const struct option lircmd_options[] = {
diff --git a/tools/irrecord.c b/tools/irrecord.c
index f52328c..772b090 100644
--- a/tools/irrecord.c
+++ b/tools/irrecord.c
@@ -113,9 +113,6 @@ lirc_t aeps = 100;
#define SAMPLES 80
-// Actual loglevel as per -D option, see lirc_log.h.
-loglevel_t loglevel = LIRC_WARNING;
-
int daemonized = 0;
struct ir_remote *emulation_data;
@@ -407,6 +404,8 @@ int main(int argc, char **argv)
char commandline[128];
char path[128];
int get_pre = 0, get_post = 0, test = 0, invert = 0, trail = 0;
+ // Actual loglevel as per -D option, see lirc_log.h.
+ loglevel_t loglevel = LIRC_WARNING;
get_commandline(argc, argv, commandline, sizeof(commandline));
force = 0;
--
2.1.0

54
bsp/buildroot/package/lirc-tools/0004-configure-check-for-clock_gettime-in-librt.patch Normal file
View File

@@ -0,0 +1,54 @@
From e654ae139cec42a6f1b5684261787d0c241cfd3b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 19 Aug 2016 15:25:48 +0200
Subject: [PATCH] configure: check for clock_gettime in librt
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configure.ac | 3 +++
daemons/Makefile.am | 2 +-
plugins/Makefile.am | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 73340c7..466e638 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,9 @@ AC_CHECK_FUNCS(gethostname gettimeofday mkfifo select socket strdup \
AC_SEARCH_LIBS([dlopen], [dl dld], [], [
AC_MSG_ERROR([unable to find the dlopen() function])
])
+# glibc < 2.17 needs librt for clock_gettime()
+AC_CHECK_LIB(rt, clock_gettime, LIBCLOCK_GETTIME="-lrt")
+AC_SUBST(LIBCLOCK_GETTIME)
AC_CHECK_FUNCS(daemon)
if test "$ac_cv_func_daemon" != yes; then
daemon=""
diff --git a/daemons/Makefile.am b/daemons/Makefile.am
index 5625627..85a28f3 100644
--- a/daemons/Makefile.am
+++ b/daemons/Makefile.am
@@ -21,7 +21,7 @@ sbin_PROGRAMS += lircd-uinput
endif
lircd_SOURCES = lircd.cpp
-lircd_LDADD = ../lib/liblirc.la
+lircd_LDADD = ../lib/liblirc.la @LIBCLOCK_GETTIME@
lircd_uinput_SOURCES = lircd-uinput.cpp
lircd_uinput_LDADD = ../lib/liblirc.la
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ddff01d..45c012a 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -127,6 +127,7 @@ zotac_la_SOURCES = zotac.c
plugin_LTLIBRARIES += mplay.la
mplay_la_SOURCES = mplay.c
+mplay_la_LIBADD = @LIBCLOCK_GETTIME@
endif
$(srcdir)/pluginlist.am:
--
2.7.4

5
bsp/buildroot/package/lirc-tools/Config.in
View File

@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIRC_TOOLS
bool "lirc-tools"
depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE
# dlopen()
depends on !BR2_STATIC_LIBS
@@ -18,7 +19,7 @@ config BR2_PACKAGE_LIRC_TOOLS
http://www.lirc.org/
comment "lirc-tools needs a uClibc or (e)glibc toolchain w/ threads, dynamic library"
comment "lirc-tools needs a uClibc or glibc toolchain w/ threads, dynamic library, C++"
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
|| BR2_TOOLCHAIN_USES_MUSL
|| !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_MUSL

5
bsp/buildroot/package/lirc-tools/lirc-tools.hash
View File

@@ -1,2 +1,3 @@
#hash from http://sourceforge.net/projects/lirc/files/LIRC/0.9.2/
sha1 585daed1eaa169b9683a507e26b1331a947a4dcd lirc-0.9.2.tar.bz2
# hash from http://sourceforge.net/projects/lirc/files/LIRC/0.9.4/
sha1 79d2300b4864ed85d6468d554ac777f39b6740ac lirc-0.9.4.tar.bz2
md5 da6aca942154256bff696d1ffa3ef646 lirc-0.9.4.tar.bz2

26
bsp/buildroot/package/lirc-tools/lirc-tools.mk
View File

@@ -4,15 +4,37 @@
#
################################################################################
LIRC_TOOLS_VERSION = 0.9.2
LIRC_TOOLS_VERSION = 0.9.4
LIRC_TOOLS_SOURCE = lirc-$(LIRC_TOOLS_VERSION).tar.bz2
LIRC_TOOLS_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_TOOLS_VERSION)
LIRC_TOOLS_LICENSE = GPLv2+
LIRC_TOOLS_LICENSE_FILES = COPYING
LIRC_TOOLS_DEPENDENCIES = host-pkgconf
LIRC_TOOLS_DEPENDENCIES = host-libxslt host-pkgconf host-python3
LIRC_TOOLS_INSTALL_STAGING = YES
# 0001-lib-use-proper-linking-method-to-avoid-parallel-buil.patch
# 0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch
# 0004-configure-check-for-clock_gettime-in-librt.patch
LIRC_TOOLS_AUTORECONF = YES
LIRC_TOOLS_CONF_ENV = XSLTPROC=yes
LIRC_TOOLS_CONF_OPTS = --without-x
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
LIRC_TOOLS_DEPENDENCIES += udev
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
LIRC_TOOLS_DEPENDENCIES += alsa-lib
endif
ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
LIRC_TOOLS_DEPENDENCIES += libusb-compat
endif
ifeq ($(BR2_PACKAGE_PORTAUDIO),y)
LIRC_TOOLS_DEPENDENCIES += portaudio
endif
define LIRC_TOOLS_INSTALL_INIT_SYSV
$(INSTALL) -D -m 0755 package/lirc-tools/S25lircd \
$(TARGET_DIR)/etc/init.d/S25lircd