Skip to contentSkip to conversation

libiio: Added package

PATCH New Paul Cercueil 2 participants 2 messages Sep 2, 2014 – Sep 16, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libiio: Added package

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

---
 package/Config.in        |  1 +
 package/libiio/Config.in | 41 +++++++++++++++++++++++++
 package/libiio/libiio.mk | 79 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 package/libiio/Config.in
 create mode 100644 package/libiio/libiio.mk
package/Config.in +1 -0
index 883dd66..b67d95d 100644
@@ -664,6 +664,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"
package/libiio/Config.in new file +41 -0

41 lines not on this page · raw message

package/libiio/libiio.mk new file +79 -0

79 lines not on this page · raw message

Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 libiio: Added package

Dear Paul Cercueil,

Thanks for this contribution.

The preferred title for new packages is:

<pkgname>: new package

Quoted 32 lines · Paul Cercueil

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

---
 package/Config.in        |  1 +
 package/libiio/Config.in | 41 +++++++++++++++++++++++++
 package/libiio/libiio.mk | 79 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 package/libiio/Config.in
 create mode 100644 package/libiio/libiio.mk
package/Config.in +1 -0
index 883dd66..b67d95d 100644
@@ -664,6 +664,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"
package/libiio/Config.in new file +0 -0
new file mode 100644
index 0000000..347269c

package/libiio/Config.in line 9

Quoted 9 lines
package/libiio/Config.in new file +9 -0
@@ -0,0 +1,41 @@
+config BR2_PACKAGE_LIBIIO
+	bool "libiio"
+	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

One empty new line between if line and the first config option.

package/libiio/Config.in line 10

Quoted 1 line
package/libiio/Config.in new file +1 -0
+	config BR2_PACKAGE_LIBIIO_LOCAL_BACKEND

We typically do not intend config options inside a if ... endif clause.

Quoted 18 lines
package/libiio/Config.in new file +18 -0
+		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

package/libiio/Config.in line 38

Quoted 10 lines
package/libiio/Config.in new file +10 -0
+		  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
+		default n

Not needed, that's the default.

Quoted 9 lines
package/libiio/Config.in new file +3 -0
+		help
+		  Install the test programs (iio_info, iio_genxml, iio_readdev).
+endif
package/libiio/libiio.mk new file +0 -0
new file mode 100644
index 0000000..7ea9c25

package/libiio/libiio.mk line 10

Quoted 10 lines
package/libiio/libiio.mk new file +10 -0
@@ -0,0 +1,79 @@
+################################################################################
+#
+# libiio
+#
+################################################################################
+
+LIBIIO_VERSION = 2014_R1
+LIBIIO_SITE = $(call github,analogdevicesinc,libiio,$(LIBIIO_VERSION))
+LIBIIO_INSTALL_STAGING = YES
+LIBIIO_LICENSE = LGPLv2

License seems to be LGPLv2.1+, not LGPLv2.

package/libiio/libiio.mk line 14

Quoted 4 lines
package/libiio/libiio.mk new file +4 -0
+LIBIIO_LICENSE_FILES = COPYING
+
+LIBIIO_CONFIGURE_OPTS = CROSS_COMPILE=$(TARGET_CROSS) \
+						VERSION_GIT=$(LIBIIO_VERSION)

Indentation is odd here. Also, this variable should be named LIBIIO_MAKE_OPTS, because really there's no "configure" step in this package.

Quoted 19 lines
package/libiio/libiio.mk new file +19 -0
+
+# Avahi support in libiio requires avahi-client,
+# which needs avahi-daemon and dbus
+ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
+	LIBIIO_DEPENDENCIES += avahi
+else
+	LIBIIO_CONFIGURE_OPTS += WITH_AVAHI=no
+endif
+
+ifneq ($(BR2_PACKAGE_LIBIIO_LOCAL_BACKEND),y)
+	LIBIIO_CONFIGURE_OPTS += WITH_LOCAL_BACKEND=no
+endif
+
+ifeq ($(BR2_PACKAGE_LIBIIO_NETWORK_BACKEND),y)
+	LIBIIO_DEPENDENCIES += libxml2
+else
+	LIBIIO_CONFIGURE_OPTS += WITH_NETWORK_BACKEND=no
+endif
+

package/libiio/libiio.mk line 43

Quoted 10 lines
package/libiio/libiio.mk new file +10 -0
+# Libiio can run without threads
+ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+	LIBIIO_CONFIGURE_OPTS += WITH_PTHREAD=no
+endif
+
+ifeq ($(BR2_PACKAGE_LIBIIO_IIOD),y)
+define LIBIIO_BUILD_IIOD
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/iiod $(LIBIIO_CONFIGURE_OPTS)
+endef
+	LIBIIO_POST_BUILD_HOOKS += LIBIIO_BUILD_IIOD

No need to indent this line.

package/libiio/libiio.mk line 49

Quoted 6 lines
package/libiio/libiio.mk new file +6 -0
+
+define LIBIIO_INSTALL_IIOD
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/iiod install \
+		$(LIBIIO_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR)
+endef
+	LIBIIO_POST_INSTALL_TARGET_HOOKS += LIBIIO_INSTALL_IIOD

Ditto.

package/libiio/libiio.mk line 56

Quoted 7 lines
package/libiio/libiio.mk new file +7 -0
+endif
+
+ifeq ($(BR2_PACKAGE_LIBIIO_TESTS),y)
+define LIBIIO_BUILD_TESTS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/tests $(LIBIIO_CONFIGURE_OPTS)
+endef
+	LIBIIO_POST_BUILD_HOOKS += LIBIIO_BUILD_TESTS

Same.

package/libiio/libiio.mk line 62

Quoted 6 lines
package/libiio/libiio.mk new file +6 -0
+
+define LIBIIO_INSTALL_TESTS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/tests install \
+		$(LIBIIO_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR)
+endef
+	LIBIIO_POST_INSTALL_TARGET_HOOKS += LIBIIO_INSTALL_TESTS

Same.

That being said, I would prefer something like this:

define LIBIIO_BUILD_CMDS

	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) libiio $(LIBIIO_CONFIGURE_OPTS)
	$(LIBIIO_BUILD_IIOD)
	$(LIBIIO_BUILD_TESTS)

endef

and same for the installation.

Could you respin a v2 with those changes?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com