Addition of gpio tools and libs

2025-02-02 19:57:19 +01:00 · 2021-04-15 22:14:18 +02:00 · 2021-04-15 22:14:18 +02:00 · 12f3fe6f5f
commit 12f3fe6f5f
parent 2e92fefe6e
7 changed files with 183 additions and 0 deletions
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@ -89,6 +89,7 @@ endmenu
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/userland-tools/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/virtual-touch/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/wifi-connect/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/wiringpi2/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/xvf3510/Config.in"
 endmenu
 menu "Additional external python modules"
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@ -44,6 +44,7 @@ BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_DTS_OVERLAYS_SUPPORT=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
+BR2_PACKAGE_LINUX_TOOLS_GPIO=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_ALSA_UTILS=y
@ -355,6 +356,7 @@ BR2_PACKAGE_PYTHON_PYJWT=y
 BR2_PACKAGE_PYTHON_PYQT5=y
 BR2_PACKAGE_PYTHON_PYUDEV=y
 BR2_PACKAGE_PYTHON_PYUSB=y
+BR2_PACKAGE_PYTHON_RPI_GPIO=y
 BR2_PACKAGE_PYTHON_SDNOTIFY=y
 BR2_PACKAGE_PYTHON_SERIAL=y
 BR2_PACKAGE_PYTHON_SMMAP2=y
@ -540,6 +542,7 @@ BR2_PACKAGE_SNAPCAST_SERVER=y
 BR2_PACKAGE_SPOTIFYD=y
 BR2_PACKAGE_USERLAND_TOOLS=y
 BR2_PACKAGE_WIFI_CONNECT=y
+BR2_PACKAGE_WIRINGPI2=y
 BR2_PACKAGE_XVF3510=y
 BR2_PACKAGE_PYTHON_ADAPT_PARSER=y
 BR2_PACKAGE_PYTHON_ASTRAL=y
--- a/buildroot-external/package/wiringpi2/0001-Buildroot-support.patch
+++ b/buildroot-external/package/wiringpi2/0001-Buildroot-support.patch
@ -0,0 +1,109 @@
+From a2c15b71bfa8d3aea5cd07c0c1a93dbf69ea0324 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Thu, 15 Apr 2021 22:10:54 +0200
+Subject: [PATCH 1/1] Buildroot support
+
+---
+ devLib/Makefile   |  6 ++++--
+ gpio/Makefile     | 12 ++++++++----
+ wiringPi/Makefile |  5 +++--
+ 3 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/devLib/Makefile b/devLib/Makefile
+index 55f8a64..24434ab 100644
+--- a/devLib/Makefile
+++ b/devLib/Makefile
+@@ -37,9 +37,9 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
+ #DEBUG	= -g -O0
+ DEBUG	= -O2
+ CC	?= gcc
+-INCLUDE	= -I.
+INCLUDE	= -I../wiringPi
+ DEFS	= -D_GNU_SOURCE
+-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC $(EXTRA_CFLAGS)
+CFLAGS	+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC $(EXTRA_CFLAGS)
+ 
+ LIBS    =
+ 
+@@ -69,6 +69,7 @@ $(STATIC):	$(OBJ)
+ $(DYNAMIC):	$(OBJ)
+ 	$Q echo "[Link (Dynamic)]"
+ 	$Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ)
+	$Q ln -sf libwiringPiDev.so.$(VERSION) libwiringPiDev.so
+ 
+ .c.o:
+ 	$Q echo [Compile] $<
+@@ -94,6 +95,7 @@ install:	$(DYNAMIC)
+ 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+ 	$Q install -m 0755 libwiringPiDev.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
+ 	$Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
+	$Q ln -sf libwiringPiDev.so.$(VERSION)				$(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so
+ 	$Q $(LDCONFIG)
+ 
+ .PHONY:	install-static
+diff --git a/gpio/Makefile b/gpio/Makefile
+index 6b8f838..dd976d0 100644
+--- a/gpio/Makefile
+++ b/gpio/Makefile
+@@ -33,10 +33,10 @@ endif
+ #DEBUG	= -g -O0
+ DEBUG	= -O2
+ CC	?= gcc
+-INCLUDE	= -I$(DESTDIR)$(PREFIX)/include
+-CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
+INCLUDE	= -I../wiringPi -I../devLib
+CFLAGS	+= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
+ 
+-LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
+LDFLAGS	= -L../wiringPi -L../devLib
+ LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
+ 
+ # May not need to  alter anything below this line
+@@ -52,9 +52,13 @@ version.h:	../VERSION
+ 	$Q echo Need to run newVersion above.
+ 
+ gpio:	$(OBJ)
+-	$Q echo [Link]
+	$Q echo "[Link (Dynamic)]"
+ 	$Q $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIBS)
+ 
+gpio-static: $(OBJ)
+	$Q echo "[Link (Static)]"
+	$Q $(CC) -static -o gpio $(OBJ) ../wiringPi/libwiringPi.a ../devLib/libwiringPiDev.a -lpthread
+
+ .c.o:
+ 	$Q echo [Compile] $<
+ 	$Q $(CC) -c $(CFLAGS) $< -o $@
+diff --git a/wiringPi/Makefile b/wiringPi/Makefile
+index 2405574..3b57cb8 100644
+--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
+@@ -39,7 +39,7 @@ DEBUG	= -O2
+ CC	?= gcc
+ INCLUDE	= -I.
+ DEFS	= -D_GNU_SOURCE
+-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC $(EXTRA_CFLAGS)
+CFLAGS	+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC $(EXTRA_CFLAGS)
+ #CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC
+ 
+ LIBS    = -lm -lpthread -lrt -lcrypt
+@@ -76,6 +76,7 @@ static:
+ $(DYNAMIC):	$(OBJ)
+ 	$Q echo "[Link (Dynamic)]"
+ 	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)
+	$Q ln -sf libwiringPi.so.$(VERSION) libwiringPi.so
+ 
+ .c.o:
+ 	$Q echo [Compile] $<
+@@ -101,7 +102,7 @@ install:	$(DYNAMIC)
+ 	$Q echo "[Install Dynamic Lib]"
+ 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+ 	$Q install -m 0755 libwiringPi.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
+-	$Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
+	$Q ln -sf libwiringPi.so.$(VERSION)				$(DESTDIR)$(PREFIX)/lib/libwiringPi.so
+ 	$Q $(LDCONFIG)
+ 
+ .PHONY: check-deb-destdir
+-- 
+2.20.1
+
--- a/buildroot-external/package/wiringpi2/Config.in
+++ b/buildroot-external/package/wiringpi2/Config.in
@ -0,0 +1,13 @@
+config BR2_PACKAGE_WIRINGPI2
+	bool "wiringpi2"
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  wiringPi libraries (and gpio command)
+
+	  https://github.com/WiringPi/WiringPi
+
+comment "wiringpi2 needs a toolchain w/ threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
--- a/buildroot-external/package/wiringpi2/wiringpi2.hash
+++ b/buildroot-external/package/wiringpi2/wiringpi2.hash
@ -0,0 +1,2 @@
+# Locally calculated
+sha256  219e01c9f6e789926ce08735ca9ef686d40c28a1591a3c87ec2d113dbab1a729  wiringpi2-f66c883d7c75280971a01619cd503d1809754801.tar.gz
--- a/buildroot-external/package/wiringpi2/wiringpi2.mk
+++ b/buildroot-external/package/wiringpi2/wiringpi2.mk
@ -0,0 +1,32 @@
+################################################################################
+#
+# wiringpi2
+#
+################################################################################
+
+WIRINGPI2_VERSION = f66c883d7c75280971a01619cd503d1809754801
+WIRINGPI2_SITE = $(call github,WiringPi,WiringPi,$(WIRINGPI2_VERSION))
+
+WIRINGPI2_LICENSE = LGPL-3.0+
+WIRINGPI2_LICENSE_FILES = COPYING.LESSER
+WIRINGPI2_INSTALL_STAGING = YES
+
+define WIRINGPI2_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/wiringPi all
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/devLib all
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/gpio all
+endef
+
+define WIRINGPI2_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi install DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib install DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
+endef
+
+define WIRINGPI2_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi install DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib install DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
+	$(INSTALL) -D -m 0755 $(@D)/gpio/gpio $(TARGET_DIR)/usr/bin/gpio
+	$(INSTALL) -D -m 0755 $(@D)/gpio/pintest $(TARGET_DIR)/usr/bin/pintest
+endef
+
+$(eval $(generic-package))
--- a/buildroot-patches/0017-Make-python-rpi-gpio-available.patch
+++ b/buildroot-patches/0017-Make-python-rpi-gpio-available.patch
@ -0,0 +1,23 @@
+From 5768521e67fd2522e08039f5d6f1c22cf04c1667 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Thu, 15 Apr 2021 20:02:56 +0200
+Subject: [PATCH 1/1] Make python-rpi-gpio available
+
+---
+ package/python-rpi-gpio/Config.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in
+index 4f59ebdb06..f34036ec3e 100644
+--- a/package/python-rpi-gpio/Config.in
+++ b/package/python-rpi-gpio/Config.in
+@@ -1,6 +1,5 @@
+ config BR2_PACKAGE_PYTHON_RPI_GPIO
+ 	bool "python-rpi-gpio"
+-	depends on BR2_arm
+ 	help
+ 	  A Python module to control the GPIO on a Raspberry Pi.
+ 
+-- 
+2.20.1
+