Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
From 599e2a11c6f48dde744012ec45686c08e15f3059 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fabrice.fontaine@orange.com>
|
||||
Date: Mon, 3 Oct 2016 10:35:52 +0200
|
||||
Subject: [PATCH] Fix compilation of MinOZW (#991)
|
||||
|
||||
LIBDIR was used in cpp/examples/MinOZW/Makefile to add dynamic
|
||||
libraries. However, as it was unset by default, the cross-compilation
|
||||
could fail if the host had a library such as libnss3.so in /.
|
||||
To fix this issue, this patch sets LIBDIR to top_buildir if it is unset
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.net/results/68719fdf1320a69310bada6d3c47654dacdb5898
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
|
||||
[Upstream commit: https://github.com/OpenZWave/open-zwave/commit/599e2a11c6f48dde744012ec45686c08e15f3059]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
cpp/examples/MinOZW/Makefile | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cpp/examples/MinOZW/Makefile b/cpp/examples/MinOZW/Makefile
|
||||
index e575632a3..95d684b77 100644
|
||||
--- a/cpp/examples/MinOZW/Makefile
|
||||
+++ b/cpp/examples/MinOZW/Makefile
|
||||
@@ -17,9 +17,11 @@ DEBUG_LDFLAGS := -g
|
||||
|
||||
top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../../)
|
||||
|
||||
+#where is put the temporary library
|
||||
+LIBDIR ?= $(top_builddir)
|
||||
|
||||
INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -I $(top_srcdir)/cpp/hidapi/hidapi/
|
||||
-LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/*.so $(top_builddir)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib )
|
||||
+LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib )
|
||||
LIBSDIR = $(abspath $(dir $(firstword $(LIBS))))
|
||||
minozwsrc := $(notdir $(wildcard $(top_srcdir)/cpp/examples/MinOZW/*.cpp))
|
||||
VPATH := $(top_srcdir)/cpp/examples/MinOZW
|
||||
@@ -5,10 +5,10 @@ config BR2_PACKAGE_OPENZWAVE
|
||||
depends on BR2_PACKAGE_HAS_UDEV
|
||||
depends on BR2_USE_WCHAR
|
||||
help
|
||||
Free software library that interfaces with selected Z-Wave PC
|
||||
controllers, allowing anyone to create applications that manipulate
|
||||
and respond to devices on a Z-Wave network, without requiring
|
||||
in-depth knowledge of the Z-Wave protocol
|
||||
Free software library that interfaces with selected Z-Wave
|
||||
PC controllers, allowing anyone to create applications that
|
||||
manipulate and respond to devices on a Z-Wave network,
|
||||
without requiring in-depth knowledge of the Z-Wave protocol
|
||||
|
||||
http://www.openzwave.net
|
||||
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
# Locally computed:
|
||||
sha256 abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238 openzwave-V1.5.tar.gz
|
||||
sha256 98851964fd8de3dd40f00d0032b47c61c17a4cf789ad5792e14149da5ab8755e 599e2a11c6f48dde744012ec45686c08e15f3059.patch
|
||||
sha256 c8db08727d03bea1213cdb29459b4b489b0d68a0866765df40ff205c6cd7224b license/license.txt
|
||||
sha256 4da452226e9064b597020ad404e1c78d8175bc31ad7c1908485a92c0a4d70284 license/lgpl.txt
|
||||
sha256 33ffdead480674d5f33e2934822a3b93c93e3f8c894667a3bf30bd1195b38f83 license/gpl.txt
|
||||
sha256 6f50ebf9af9b6658c7936ffcc6fedd99254df984c0fec2e6ffb9f3aa1c4ef3e1 license/Apache-License-2.0.txt
|
||||
|
||||
@@ -6,19 +6,13 @@
|
||||
|
||||
OPENZWAVE_VERSION = V1.5
|
||||
OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION))
|
||||
OPENZWAVE_LICENSE = LGPLv3+, GPLv3 (examples), Apache-2.0 (sh2ju.sh)
|
||||
OPENZWAVE_LICENSE = LGPL-3.0+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh)
|
||||
OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \
|
||||
license/gpl.txt license/Apache-License-2.0.txt
|
||||
|
||||
OPENZWAVE_DEPENDENCIES = host-pkgconf udev
|
||||
OPENZWAVE_INSTALL_STAGING = YES
|
||||
|
||||
# This patch fixes incorrect default value of LIBDIR:
|
||||
# http://autobuild.buildroot.net/results/68719fdf1320a69310bada6d3c47654dacdb5898
|
||||
# This patch is currently in dev branch and will be a part of v1.6
|
||||
OPENZWAVE_PATCH = \
|
||||
https://github.com/OpenZWave/open-zwave/commit/599e2a11c6f48dde744012ec45686c08e15f3059.patch
|
||||
|
||||
# Set instlibdir to install libopenzwave.so* in the correct directory
|
||||
# otherwise openzwave will check that /lib64 exists (on the host) to
|
||||
# know if the library should be installed in $(PREFIX)/lib or $(PREFIX)/lib64.
|
||||
|
||||
Reference in New Issue
Block a user