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

42
bsp/buildroot/package/libiio/0001-cmake-libxml2-detection-try-first-the-CMake-module-f.patch
View File

@@ -1,42 +0,0 @@
From 4f849e1d2287206cfb7ff0fdeca96c22383b0d53 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 29 Dec 2014 19:05:13 +0100
Subject: [PATCH] cmake: libxml2 detection: try first the CMake module from
libxml2
Libxml2 >=2.9.2 provides its own CMake module, so check for it before
falling back on the CMake's module FindLibXml2.cmake.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
CMakeLists.txt | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 393fee3..b4f1d26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,19 @@ endif()
find_library(AVAHI_CLIENT_LIBRARIES avahi-client)
find_library(AVAHI_COMMON_LIBRARIES avahi-common)
find_library(PTHREAD_LIBRARIES pthread)
-include(FindLibXml2)
+
+# Since libxml2-2.9.2, libxml2 provides its own LibXml2-config.cmake, with all
+# variables correctly set.
+# So, try first to find the CMake module provided by libxml2 package, then fallback
+# on the CMake's FindLibXml2.cmake module (which can lack some definition, especially
+# in static build case).
+find_package(LibXml2 QUIET NO_MODULE)
+if(DEFINED LIBXML2_VERSION_STRING)
+ set(LIBXML2_FOUND ON)
+ set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS})
+else()
+ include(FindLibXml2)
+endif()
set(LIBIIO_CFILES channel.c device.c context.c buffer.c utilities.c)
set(LIBIIO_HEADERS iio.h)
--
2.2.1

26
bsp/buildroot/package/libiio/0001-lock.c-Don-t-include-pthread.h-if-NO_THREADS-is-defi.patch Normal file
View File

@@ -0,0 +1,26 @@
From d052d263600549979a6219a59e85af80eeafc6d2 Mon Sep 17 00:00:00 2001
From: Paul Cercueil <paul.cercueil@analog.com>
Date: Tue, 5 Jul 2016 12:12:41 +0200
Subject: [PATCH] lock.c: Don't include <pthread.h> if NO_THREADS is defined
Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
---
lock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lock.c b/lock.c
index 39248ab..00eb9d9 100644
--- a/lock.c
+++ b/lock.c
@@ -18,7 +18,7 @@
#ifdef _WIN32
#include <windows.h>
-#else
+#elif !defined(NO_THREADS)
#include <pthread.h>
#endif
--
2.8.1

30
bsp/buildroot/package/libiio/0002-CMake-Link-with-librt-if-found.patch Normal file
View File

@@ -0,0 +1,30 @@
From 1bc450179a0819970261e6a29071756d09b71c5f Mon Sep 17 00:00:00 2001
From: Paul Cercueil <paul.cercueil@analog.com>
Date: Fri, 19 Aug 2016 09:00:58 +0200
Subject: [PATCH] CMake: Link with librt if found
This is required for older versions of glibc.
Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
---
CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a339fe..3dd3520 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,6 +113,10 @@ add_definitions(-DLIBIIO_VERSION_GIT="${LIBIIO_VERSION_GIT}")
if(WITH_LOCAL_BACKEND)
add_definitions(-DLOCAL_BACKEND=1)
set(LIBIIO_CFILES ${LIBIIO_CFILES} local.c)
+
+ # Link with librt if present
+ find_library(LIBRT_LIBRARIES rt)
+ set(LIBS_TO_LINK ${LIBS_TO_LINK} ${LIBRT_LIBRARIES})
endif()
find_library(LIBUSB_LIBRARIES usb-1.0)
--
2.8.1

36
bsp/buildroot/package/libiio/0002-cmake-fix-build-on-unix-systems-without-cpp.patch
View File

@@ -1,36 +0,0 @@
From 2e6fa357ffbe755bfecaecad4fc82e3307fe2831 Mon Sep 17 00:00:00 2001
From: Paul Cercueil <paul.cercueil@analog.com>
Date: Wed, 22 Jul 2015 10:25:01 +0200
Subject: [PATCH] CMake: Fix build on UNIX systems without a C++ compiler
Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
---
bindings/csharp/CMakeLists.txt | 2 +-
bindings/python/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bindings/csharp/CMakeLists.txt b/bindings/csharp/CMakeLists.txt
index 8aafb8f..fceab88 100644
--- a/bindings/csharp/CMakeLists.txt
+++ b/bindings/csharp/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.7)
-project(libiio-sharp)
+project(libiio-sharp LANGUAGES NONE)
find_program(MCS_EXECUTABLE
NAMES mcs csc
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index 22ffdb4..76ceae8 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.7)
-project(libiio-py)
+project(libiio-py LANGUAGES NONE)
include(FindPythonInterp)
--
2.1.4

39
bsp/buildroot/package/libiio/Config.in
View File

@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBIIO
bool "libiio"
select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND if !BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND if !BR2_PACKAGE_LIBIIO_XML_BACKEND
help
Libiio is a library to ease the development of software
interfacing Linux Industrial I/O (IIO) devices.
@@ -15,27 +15,60 @@ config BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
help
Enable the local backend of the library.
config BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
bool "Network backend"
config BR2_PACKAGE_LIBIIO_XML_BACKEND
bool "XML backend"
select BR2_PACKAGE_LIBXML2
default y
help
Enable the XML backend of the library.
config BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
bool "Network backend"
depends on BR2_PACKAGE_LIBIIO_XML_BACKEND
default y
help
Enable the network backend of the library.
config BR2_PACKAGE_LIBIIO_USB_BACKEND
bool "USB backend"
depends on BR2_TOOLCHAIN_HAS_THREADS # from libusb
depends on BR2_PACKAGE_LIBIIO_XML_BACKEND
select BR2_PACKAGE_LIBUSB
default y
help
Enable the USB backend of the library.
comment "The USB backend needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_LIBIIO_SERIAL_BACKEND
bool "Serial backend"
depends on BR2_PACKAGE_LIBIIO_XML_BACKEND
select BR2_PACKAGE_LIBSERIALPORT
default y
help
Enable the serial backend of the library.
config BR2_PACKAGE_LIBIIO_IIOD
bool "IIO Daemon"
select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_bfin
default y
help
Install the IIO Daemon.
comment "IIO Daemon needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_bfin
comment "IIO Daemon is not yet available on Blackfin"
depends on BR2_bfin
config BR2_PACKAGE_LIBIIO_TESTS
bool "Install test programs"
select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
select BR2_PACKAGE_LIBIIO_XML_BACKEND
select BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
depends on BR2_TOOLCHAIN_HAS_THREADS
help

4
bsp/buildroot/package/libiio/libiio.hash
View File

@@ -1,2 +1,2 @@
# From https://github.com/analogdevicesinc/libiio/archive/v0.5/
sha256 c41cdcfeae8717e72f1100b4dac9d7cc9d86f4e0731da3354149cb7e051666f3 libiio-0.5.tar.gz
# From https://github.com/analogdevicesinc/libiio/archive/v0.7/
sha256 c2b02f1cb51870db52368fdaa8087dc2a4ec43f2bc3c3514d8214952f14c3f39 libiio-0.7.tar.gz

32
bsp/buildroot/package/libiio/libiio.mk
View File

@@ -4,22 +4,37 @@
#
################################################################################
LIBIIO_VERSION = 0.5
LIBIIO_VERSION = 0.7
LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION))
LIBIIO_INSTALL_STAGING = YES
LIBIIO_LICENSE = LGPLv2.1+
LIBIIO_LICENSE_FILES = COPYING
LIBIIO_LICENSE_FILES = COPYING.txt
LIBIIO_CONF_OPTS = -DENABLE_IPV6=ON \
-DWITH_LOCAL_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_LOCAL_BACKEND),ON,OFF) \
-DWITH_NETWORK_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_NETWORK_BACKEND),ON,OFF) \
-DWITH_TESTS=$(if $(BR2_PACKAGE_LIBIIO_TESTS),ON,OFF) \
-DWITH_DOC=OFF
ifeq ($(BR2_PACKAGE_LIBIIO_NETWORK_BACKEND),y)
ifeq ($(BR2_PACKAGE_LIBIIO_XML_BACKEND),y)
LIBIIO_DEPENDENCIES += libxml2
LIBIIO_CONF_OPTS += -DWITH_NETWORK_BACKEND=ON
LIBIIO_CONF_OPTS += -DWITH_XML_BACKEND=ON
else
LIBIIO_CONF_OPTS += -DWITH_NETWORK_BACKEND=OFF
LIBIIO_CONF_OPTS += -DWITH_XML_BACKEND=OFF
endif
ifeq ($(BR2_PACKAGE_LIBIIO_USB_BACKEND),y)
LIBIIO_DEPENDENCIES += libusb
LIBIIO_CONF_OPTS += -DWITH_USB_BACKEND=ON
else
LIBIIO_CONF_OPTS += -DWITH_USB_BACKEND=OFF
endif
ifeq ($(BR2_PACKAGE_LIBIIO_SERIAL_BACKEND),y)
LIBIIO_DEPENDENCIES += libserialport
LIBIIO_CONF_OPTS += -DWITH_SERIAL_BACKEND=ON
else
LIBIIO_CONF_OPTS += -DWITH_SERIAL_BACKEND=OFF
endif
ifeq ($(BR2_PACKAGE_LIBIIO_IIOD),y)
@@ -64,13 +79,6 @@ define LIBIIO_INSTALL_INIT_SYSV
$(INSTALL) -D -m 0755 package/libiio/S99iiod \
$(TARGET_DIR)/etc/init.d/S99iiod
endef
define LIBIIO_INSTALL_INIT_SYSTEMD
$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
$(INSTALL) -D -m 0644 $(@D)/debian/iiod.service \
$(TARGET_DIR)/usr/lib/systemd/system/iiod.service
ln -fs ../../../../usr/lib/systemd/system/iiod.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/iiod.service
endef
endif
$(eval $(cmake-package))