From b3d4dfbfb5dda1601d74f774b2bccf873afa0e9f Mon Sep 17 00:00:00 2001 From: "steve.jeong" Date: Fri, 15 Apr 2022 11:19:29 +0900 Subject: [PATCH] debian: update package version 3.13.1 ODROID-COMMON: Add link libgpiod ODROID-N2/C4: fix odroid-wiringpi postinst server build error: link ./configure: line 3480: syntax error near unexpected token `LIBCRYPT,' ./configure: line 3480: `PKG_CHECK_MODULES(LIBCRYPT, libcrypt)' local build error: link /usr/bin/ld: undefined reference to `gpiod_line_set_value' ... local build error: odroid-wiringpi.postinst error cp: cannot stat '/tmp/odroid-wiringpi/rules.d/99-odroid-wiringpi-aml.rules': No such file or directory Signed-off-by: steve.jeong Change-Id: I0faf7710461ab487afdf02a8e5511ea2a6385f7e --- debian/changelog | 8 +++++--- debian/odroid-wiringpi.postinst | 31 ------------------------------- gpio/Makefile.am | 2 +- wiringPiD/Makefile.am | 2 +- 4 files changed, 7 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2c3494f..8222522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -odroid-wiringpi (3.13) UNRELEASED; urgency=medium +odroid-wiringpi (3.13.1) stable; urgency=medium - * ODROID-N2/C4: fix compile error + * ODROID-COMMON: Add link libgpiod + * ODROID-N2/C4: Fix compile error + * ODROID-N2/C4: Fix postinst error - -- steve Thu, 14 Apr 2022 18:52:19 +0900 + -- steve Fri, 15 Apr 2022 14:37:13 +0900 odroid-wiringpi (3.12) stable; urgency=medium diff --git a/debian/odroid-wiringpi.postinst b/debian/odroid-wiringpi.postinst index c02cfba..cbf347d 100644 --- a/debian/odroid-wiringpi.postinst +++ b/debian/odroid-wiringpi.postinst @@ -8,37 +8,6 @@ msg() { case "$1" in configure) - if [ -c "/dev/gpiomem" ] && [ "$(stat -c "%a %G" "/dev/gpiomem")" != "660"*"odroid" ]; then - hardware=$(fgrep -a Hardware /proc/cpuinfo | head -1 | awk '{ printf("%s %s %s\n", $3, $4, $5) }' | xargs) - [ "$hardware",, != *"odroid"* ] \ - && [ -f "/sys/firmware/devicetree/base/model" ] \ - && hardware=$(cat /sys/firmware/devicetree/base/model) - case "$(echo $hardware | tr [:upper:] [:lower:])" in - *xu4) - cp -f /tmp/odroid-wiringpi/rules.d/99-odroid-wiringpi-exynos.rules /etc/udev/rules.d/ - ;; - *c|*c1|*c2) - cp -f /tmp/odroid-wiringpi/rules.d/99-odroid-wiringpi-meson.rules /etc/udev/rules.d/ - ;; - *n2|*c4) - cp -f /tmp/odroid-wiringpi/rules.d/99-odroid-wiringpi-aml.rules /etc/udev/rules.d/ - ;; - *) - msg "This system seems not ODROID" - ;; - esac - - msg "Reload udev..." - [ -x "$(command -v udevadm)" ] \ - && udevadm trigger \ - || msg "udevadm not found. Please reboot to take effect" - else - msg "Not found $GPIOMEM" - msg "You will not be able to use WiringPi without root permission" - fi - - msg "Remove temporary files..." - rm -rf /tmp/odroid-wiringpi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/gpio/Makefile.am b/gpio/Makefile.am index c2a1516..5e61de8 100644 --- a/gpio/Makefile.am +++ b/gpio/Makefile.am @@ -10,5 +10,5 @@ gpio_CFLAGS = \ $(LIBCRYPT_CFLAGS) gpio_LDFLAGS = \ - -L../wiringPi/.libs -lwiringPi \ + -L../wiringPi/.libs -lwiringPi -lgpiod \ $(LIBCRYPT_LIBS) diff --git a/wiringPiD/Makefile.am b/wiringPiD/Makefile.am index 9755742..a2427cc 100644 --- a/wiringPiD/Makefile.am +++ b/wiringPiD/Makefile.am @@ -12,5 +12,5 @@ wiringPiD_CFLAGS = \ $(LIBCRYPT_CFLAGS) wiringPiD_LDFLAGS = \ - -L../wiringPi/.libs -lwiringPi \ + -L../wiringPi/.libs -lwiringPi -lgpiod \ $(LIBCRYPT_LIBS)