The backwards-incompatible v2 series uses GPIO character device uAPI v2 introduced in Linux 5.10, option CONFIG_GPIO_CDEV_V1 not needed anymore.
The gpiofind tool has been dropped upstream, gpionotify added. Both gpiomon (since v0.3 already) and the new gpionotify can be used on multiple GPIO lines, so adapt the Kconfig help text. Since the kernel uapi header gpio.h is included in the sources now, there is no need for a specific minimum version of the kernel headers anymore, so remove those comments. Signed-off-by: Markus Heidelberg <[email protected]> --- rules/libgpiod.in | 14 +++++++------- rules/libgpiod.make | 27 +++++++++++++++++++-------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/rules/libgpiod.in b/rules/libgpiod.in index 14c38dddc..450df32d7 100644 --- a/rules/libgpiod.in +++ b/rules/libgpiod.in @@ -9,7 +9,7 @@ menuconfig LIBGPIOD help libgpiod is a library accompanied by a set of tools for interacting with the Linux GPIO character device. - Requires kernel-headers >= 4.8. + Requires kernel-headers. if LIBGPIOD @@ -44,19 +44,19 @@ config LIBGPIOD_GPIOSET help Sets values of specified GPIO lines -config LIBGPIOD_GPIOFIND +config LIBGPIOD_GPIOMON bool - prompt "Install gpiofind" + prompt "Install gpiomon" select LIBGPIOD_TOOLS help - Finds the gpiochip given the line name + Waits for events on GPIO lines -config LIBGPIOD_GPIOMON +config LIBGPIOD_GPIONOTIFY bool - prompt "Install gpiomon" + prompt "Install gpionotify" select LIBGPIOD_TOOLS help - Waits for events on a GPIO line + Waits for info changes on GPIO lines config LIBGPIOD_CXX bool diff --git a/rules/libgpiod.make b/rules/libgpiod.make index 937057cd7..a34172413 100644 --- a/rules/libgpiod.make +++ b/rules/libgpiod.make @@ -14,17 +14,24 @@ PACKAGES-$(PTXCONF_LIBGPIOD) += libgpiod # # Paths and names # -LIBGPIOD_VERSION := 1.6.3 -LIBGPIOD_MD5 := 25b6d8e7ebda37bb9b55aa290af0f062 +LIBGPIOD_VERSION := 2.1.3 +LIBGPIOD_MD5 := dd37487da746569b7311b2c8fd2f907d LIBGPIOD := libgpiod-$(LIBGPIOD_VERSION) LIBGPIOD_SUFFIX := tar.gz LIBGPIOD_URL := https://www.kernel.org/pub/software/libs/libgpiod/$(LIBGPIOD).$(LIBGPIOD_SUFFIX) LIBGPIOD_SOURCE := $(SRCDIR)/$(LIBGPIOD).$(LIBGPIOD_SUFFIX) LIBGPIOD_DIR := $(BUILDDIR)/$(LIBGPIOD) -LIBGPIOD_LICENSE := LGPL-2.1-or-later +LIBGPIOD_LICENSE := LGPL-2.1-or-later AND GPL-2.0-only WITH Linux-syscall-note LIBGPIOD_LICENSE_FILES := \ - file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de \ - file://lib/core.c;startline=1;endline=6;md5=d5b8d8a364ceff5e7c59b0638f54028c + file://COPYING;md5=7542998a6925b152c16facf9eaf5eb0c \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/Linux-syscall-note.txt;md5=6b0dff741019b948dfe290c05d6f361c + +ifdef PTXCONF_LIBGPIOD_TOOLS +LIBGPIOD_LICENSE += AND GPL-2.0-or-later +LIBGPIOD_LICENSE_FILES += file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 +endif # ---------------------------------------------------------------------------- # Prepare @@ -34,15 +41,19 @@ LIBGPIOD_CONF_TOOL := autoconf LIBGPIOD_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_LIBGPIOD_TOOLS)-tools \ + --disable-gpioset-interactive \ --disable-tests \ + --disable-profiling \ + --disable-examples \ --$(call ptx/endis, PTXCONF_LIBGPIOD_CXX)-bindings-cxx \ - --$(call ptx/endis, PTXCONF_LIBGPIOD_PYTHON3)-bindings-python + --$(call ptx/endis, PTXCONF_LIBGPIOD_PYTHON3)-bindings-python \ + --disable-bindings-rust LIBGPIOD_CONF_ENV := \ $(CROSS_ENV) \ $(if $(PTXCONF_LIBGPIOD_PYTHON3), ac_cv_path_PYTHON=$(CROSS_PYTHON3)) -# libgpiod requires kernel headers >= 4.8 +# libgpiod requires kernel headers ifdef PTXCONF_KERNEL_HEADER LIBGPIOD_CPPFLAGS := \ -isystem $(KERNEL_HEADERS_INCLUDE_DIR) @@ -54,8 +65,8 @@ LIBGPIOD_TOOLS-$(PTXCONF_LIBGPIOD_GPIODETECT) += gpiodetect LIBGPIOD_TOOLS-$(PTXCONF_LIBGPIOD_GPIOINFO) += gpioinfo LIBGPIOD_TOOLS-$(PTXCONF_LIBGPIOD_GPIOGET) += gpioget LIBGPIOD_TOOLS-$(PTXCONF_LIBGPIOD_GPIOSET) += gpioset -LIBGPIOD_TOOLS-$(PTXCONF_LIBGPIOD_GPIOFIND) += gpiofind LIBGPIOD_TOOLS-$(PTXCONF_LIBGPIOD_GPIOMON) += gpiomon +LIBGPIOD_TOOLS-$(PTXCONF_LIBGPIOD_GPIONOTIFY) += gpionotify # ---------------------------------------------------------------------------- # Target-Install -- 2.43.0
