diff mbox

[v5] libiio: new package

Message ID 1418722446-3831-1-git-send-email-paul.cercueil@analog.com
State Accepted
Headers show

Commit Message

Paul Cercueil Dec. 16, 2014, 9:34 a.m. UTC 
Libiio is a library to ease the development of software interfacing
Linux Industrial I/O (IIO) devices.

http://wiki.analog.com/resources/tools-software/linux-software/libiio

v2: Simplify greatly the patch (upstream now uses CMake)
v3: Add support for IPv6 and allow installation of systemd service file
v4: Added .hash file
v5: Rework libiio.mk and init.d scripts after feedback from upstream

Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
---
 package/Config.in          |  1 +
 package/libiio/Config.in   | 43 +++++++++++++++++++++++++++++++++++++++
 package/libiio/S99iiod.sh  | 40 +++++++++++++++++++++++++++++++++++++
 package/libiio/libiio.hash |  2 ++
 package/libiio/libiio.mk   | 50 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 136 insertions(+)
 create mode 100644 package/libiio/Config.in
 create mode 100644 package/libiio/S99iiod.sh
 create mode 100644 package/libiio/libiio.hash
 create mode 100644 package/libiio/libiio.mk

Comments

Thomas Petazzoni Dec. 21, 2014, 9:39 p.m. UTC | #1 
Dear Paul Cercueil,

On Tue, 16 Dec 2014 10:34:06 +0100, Paul Cercueil wrote:
> Libiio is a library to ease the development of software interfacing
> Linux Industrial I/O (IIO) devices.
> 
> http://wiki.analog.com/resources/tools-software/linux-software/libiio
> 
> v2: Simplify greatly the patch (upstream now uses CMake)
> v3: Add support for IPv6 and allow installation of systemd service file
> v4: Added .hash file
> v5: Rework libiio.mk and init.d scripts after feedback from upstream
> 
> Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
> ---
>  package/Config.in          |  1 +
>  package/libiio/Config.in   | 43 +++++++++++++++++++++++++++++++++++++++
>  package/libiio/S99iiod.sh  | 40 +++++++++++++++++++++++++++++++++++++
>  package/libiio/libiio.hash |  2 ++
>  package/libiio/libiio.mk   | 50 ++++++++++++++++++++++++++++++++++++++++++++++
>  5 files changed, 136 insertions(+)
>  create mode 100644 package/libiio/Config.in
>  create mode 100644 package/libiio/S99iiod.sh
>  create mode 100644 package/libiio/libiio.hash
>  create mode 100644 package/libiio/libiio.mk

Thanks, applied, after doing a bunch of changes:

    [Thomas:
     - Remove changelog from the commit log.
     - Rename init script to S99iiod instead of S99iiod.sh
     - Remove "status" command from init script, and implement "restart"
       instead.
     - Add dependency on thread support in toolchain.
     - Fixup indentation in the .mk file.
     - Fixup wrapping in the Config.in help text.]

Also, if you don't have any /sys/bus/iio/devices directory, the iiod
daemon doesn't start, with a mysterious "Unable to create context"
message, which only appears if you start iiod manually (not from the
init script). Maybe it should be improved a bit: make sure to have a
proper error message, and make sure it gets shown when iiod is started
from the init script.

Thanks!

Thomas
Paul Cercueil Jan. 7, 2015, 8:55 a.m. UTC | #2 
Dear Thomas,

Thanks for merging this patch - and thanks for the extra work.

I see you added a dependency on thread support in the toolchain, is it 
because it breaks some builds if not set?
The library in itself will work just fine on a system without threads, 
only the IIO Daemon requires threads, that's why I'm asking.

Regards,

Paul Cercueil

On 21/12/2014 22:39, Thomas Petazzoni wrote:
> Dear Paul Cercueil,
>
> On Tue, 16 Dec 2014 10:34:06 +0100, Paul Cercueil wrote:
>> Libiio is a library to ease the development of software interfacing
>> Linux Industrial I/O (IIO) devices.
>>
>> http://wiki.analog.com/resources/tools-software/linux-software/libiio
>>
>> v2: Simplify greatly the patch (upstream now uses CMake)
>> v3: Add support for IPv6 and allow installation of systemd service file
>> v4: Added .hash file
>> v5: Rework libiio.mk and init.d scripts after feedback from upstream
>>
>> Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
>> ---
>>   package/Config.in          |  1 +
>>   package/libiio/Config.in   | 43 +++++++++++++++++++++++++++++++++++++++
>>   package/libiio/S99iiod.sh  | 40 +++++++++++++++++++++++++++++++++++++
>>   package/libiio/libiio.hash |  2 ++
>>   package/libiio/libiio.mk   | 50 ++++++++++++++++++++++++++++++++++++++++++++++
>>   5 files changed, 136 insertions(+)
>>   create mode 100644 package/libiio/Config.in
>>   create mode 100644 package/libiio/S99iiod.sh
>>   create mode 100644 package/libiio/libiio.hash
>>   create mode 100644 package/libiio/libiio.mk
>
> Thanks, applied, after doing a bunch of changes:
>
>      [Thomas:
>       - Remove changelog from the commit log.
>       - Rename init script to S99iiod instead of S99iiod.sh
>       - Remove "status" command from init script, and implement "restart"
>         instead.
>       - Add dependency on thread support in toolchain.
>       - Fixup indentation in the .mk file.
>       - Fixup wrapping in the Config.in help text.]
>
> Also, if you don't have any /sys/bus/iio/devices directory, the iiod
> daemon doesn't start, with a mysterious "Unable to create context"
> message, which only appears if you start iiod manually (not from the
> init script). Maybe it should be improved a bit: make sure to have a
> proper error message, and make sure it gets shown when iiod is started
> from the init script.
>
> Thanks!
>
> Thomas
>
Thomas Petazzoni Jan. 7, 2015, 9 a.m. UTC | #3 
Dear Paul Cercueil,

On Wed, 7 Jan 2015 09:55:20 +0100, Paul Cercueil wrote:

> Thanks for merging this patch - and thanks for the extra work.
> 
> I see you added a dependency on thread support in the toolchain, is it 
> because it breaks some builds if not set?
> The library in itself will work just fine on a system without threads, 
> only the IIO Daemon requires threads, that's why I'm asking.

I honestly don't remember. You can try building with the base config
http://autobuild.buildroot.org/toolchains/configs/br-arm-full-nothread.config
and see what breaks (of course after removing the dependency on
threads).

Thanks,

Thomas
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index 48be2df..3ce5260 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -707,6 +707,7 @@  menu "Hardware handling"
 	source "package/libfreefare/Config.in"
 	source "package/libftdi/Config.in"
 	source "package/libhid/Config.in"
+	source "package/libiio/Config.in"
 	source "package/libinput/Config.in"
 	source "package/libiqrf/Config.in"
 	source "package/libllcp/Config.in"
diff --git a/package/libiio/Config.in b/package/libiio/Config.in
new file mode 100644
index 0000000..4bded41
--- /dev/null
+++ b/package/libiio/Config.in
@@ -0,0 +1,43 @@ 
+config BR2_PACKAGE_LIBIIO
+	bool "libiio"
+	select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND if !BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
+	help
+	  Libiio is a library to ease the development of software interfacing
+	  Linux Industrial I/O (IIO) devices.
+
+	  http://wiki.analog.com/resources/tools-software/linux-software/libiio
+
+if BR2_PACKAGE_LIBIIO
+
+config BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
+	bool "Local backend"
+	default y
+	help
+	  Enable the local backend of the library.
+
+config BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
+	bool "Network backend"
+	select BR2_PACKAGE_LIBXML2
+	default y
+	help
+	  Enable the network backend of the library.
+
+config BR2_PACKAGE_LIBIIO_IIOD
+	bool "IIO Daemon"
+	select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	default y
+	help
+	  Install the IIO Daemon.
+
+comment "IIO Daemon needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_LIBIIO_TESTS
+	bool "Install test programs"
+	select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
+	select BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
+	help
+	  Install the test programs (iio_info, iio_genxml, iio_readdev).
+
+endif
diff --git a/package/libiio/S99iiod.sh b/package/libiio/S99iiod.sh
new file mode 100644
index 0000000..bf6294b
--- /dev/null
+++ b/package/libiio/S99iiod.sh
@@ -0,0 +1,40 @@ 
+#!/bin/sh
+
+# Server-side demuxing by default
+IIOD_OPTS=-D
+
+[ -r /etc/default/iiod ] && . /etc/default/iiod
+
+case "$1" in
+	start)
+		echo "Starting IIO Server Daemon"
+		start-stop-daemon -S -b -q -m -p /var/run/iiod.pid -x /usr/sbin/iiod -- $IIOD_OPTS
+		exit $?
+		;;
+
+	stop)
+		echo "Stopping IIO Server Daemon"
+		start-stop-daemon -K -q -p /var/run/iiod.pid 2>/dev/null
+		exit $?
+		;;
+
+	status)
+		RET=1
+		if [ -f /var/run/iiod.pid ] ; then
+			kill -0 `cat /var/run/iiod.pid` >/dev/null 2>&1
+			RET=$?
+		fi
+
+		if [ $RET -eq 0 ] ; then
+			echo "iiod is running"
+		else
+			echo "iiod is NOT running"
+		fi
+
+		exit $RET
+		;;
+
+	*)
+		echo "Usage: $0 {start|stop|status}"
+		exit 1
+esac
diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash
new file mode 100644
index 0000000..bbca4c8
--- /dev/null
+++ b/package/libiio/libiio.hash
@@ -0,0 +1,2 @@ 
+# From https://github.com/analogdevicesinc/libiio/archive/v0.3/
+sha256	a3571bbf7e80b9e0a8d6bd4b39a5bcd18f80a3d36c4a6f2092dfeefc98e20e07	libiio-v0.3.tar.gz
diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk
new file mode 100644
index 0000000..9077896
--- /dev/null
+++ b/package/libiio/libiio.mk
@@ -0,0 +1,50 @@ 
+################################################################################
+#
+# libiio
+#
+################################################################################
+
+LIBIIO_VERSION = v0.3
+LIBIIO_SITE = $(call github,analogdevicesinc,libiio,$(LIBIIO_VERSION))
+LIBIIO_INSTALL_STAGING = YES
+LIBIIO_LICENSE = LGPLv2.1+
+LIBIIO_LICENSE_FILES = COPYING
+
+LIBIIO_CONF_OPTS = -DENABLE_IPV6=$(if $(BR2_INET_IPV6),ON,OFF) \
+				   -DWITH_LOCAL_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_LOCAL_BACKEND),ON,OFF) \
+				   -DWITH_TESTS=$(if $(BR2_PACKAGE_LIBIIO_TESTS),ON,OFF)
+
+ifeq ($(BR2_PACKAGE_LIBIIO_NETWORK_BACKEND),y)
+LIBIIO_DEPENDENCIES += libxml2
+LIBIIO_CONF_OPTS += -DWITH_NETWORK_BACKEND=ON
+else
+LIBIIO_CONF_OPTS += -DWITH_NETWORK_BACKEND=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBIIO_IIOD),y)
+LIBIIO_DEPENDENCIES += host-flex host-bison
+LIBIIO_CONF_OPTS += -DWITH_IIOD=ON
+else
+LIBIIO_CONF_OPTS += -DWITH_IIOD=OFF
+endif
+
+# Avahi support in libiio requires avahi-client, which needs avahi-daemon
+ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON),yy)
+LIBIIO_DEPENDENCIES += avahi
+endif
+
+ifeq ($(BR2_PACKAGE_LIBIIO_IIOD),y)
+define LIBIIO_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/libiio/S99iiod.sh \
+		$(TARGET_DIR)/etc/init.d/S99iiod.sh
+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)/lib/systemd/system/iiod.service
+	ln -fs /lib/systemd/system/iiod.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/iiod.service
+endef
+endif
+
+$(eval $(cmake-package))