Skip to contentSkip to conversation

package/openocd: drop non-existing libhid support

PATCH In review Peter Korsgaard 2 participants 4 messages Nov 25, 2024 – Nov 26, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/openocd: drop non-existing libhid support

This was added by commit aa441aa84c38a (openocd: bump to version 0.8.0) ~10 years ago, but openocd 0.8.0 (or any later version) does not contain any libhid support, so drop it.

---
 package/openocd/openocd.mk | 1 -
 1 file changed, 1 deletion(-)
package/openocd/openocd.mk +0 -1
index 6b9f5541cd..78f872fa76 100644
@@ -55,7 +55,6 @@ OPENOCD_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \
 	$(if $(BR2_PACKAGE_LIBUSB),libusb) \
 	$(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \
-	$(if $(BR2_PACKAGE_LIBHID),libhid) \
 	$(if $(BR2_PACKAGE_HIDAPI),hidapi)
 
 ifeq ($(BR2_PACKAGE_LIBGPIOD),y)
Signature · 6 lines
2.39.5

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/3 package/libhid: drop package

The upstream location has been dead for 10 years and hidapi is a better alternative nowadays, so drop it.

---
 .checkpackageignore                           |  3 --
 Config.in.legacy                              |  8 +++++
 package/Config.in                             |  1 -
 .../0001-dont-fiddle-with-debug-flags.patch   | 19 ------------
 .../libhid/0002-no-newline-in-ldflags.patch   | 22 --------------
 package/libhid/0003-uclinux.patch             | 29 -------------------
 package/libhid/Config.in                      | 14 ---------
 package/libhid/libhid.hash                    |  3 --
 package/libhid/libhid.mk                      | 23 ---------------
 9 files changed, 8 insertions(+), 114 deletions(-)
 delete mode 100644 package/libhid/0001-dont-fiddle-with-debug-flags.patch
 delete mode 100644 package/libhid/0002-no-newline-in-ldflags.patch
 delete mode 100644 package/libhid/0003-uclinux.patch
 delete mode 100644 package/libhid/Config.in
 delete mode 100644 package/libhid/libhid.hash
 delete mode 100644 package/libhid/libhid.mk
.checkpackageignore +0 -3
index f897565718..4d517cd16f 100644
@@ -683,9 +683,6 @@ package/libgsm/0001-Misc-fixes-from-Archlinux.patch lib_patch.Upstream
 package/libgtk2/0001-reduce-dependencies.patch lib_patch.Upstream
 package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch lib_patch.Upstream
 package/libhdhomerun/0001-dont-strip.patch lib_patch.Upstream
-package/libhid/0001-dont-fiddle-with-debug-flags.patch lib_patch.Upstream
-package/libhid/0002-no-newline-in-ldflags.patch lib_patch.Upstream
-package/libhid/0003-uclinux.patch lib_patch.Upstream
 package/libical/0001-no-tests.patch lib_patch.Upstream
 package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch lib_patch.Upstream
 package/libiio/S99iiod Shellcheck lib_sysv.Variables
Config.in.legacy +8 -0
index aa10573c23..3636228440 100644
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2025.02"
 
+config BR2_PACKAGE_LIBHID
+	bool "libhid has been removed"
+	select BR2_LEGACY
+	help
+	  The libhid package was removed as it is not maintained
+	  anymore and the upstream URL is gone. Consider using hidapi
+	  instead.
+
 config BR2_PACKAGE_QUAGGA
 	bool "quagga has been removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index 83fc6c906d..d9af39b900 100644
@@ -1822,7 +1822,6 @@ menu "Hardware handling"
 	source "package/libgpiod/Config.in"
 	source "package/libgpiod2/Config.in"
 	source "package/libgudev/Config.in"
-	source "package/libhid/Config.in"
 	source "package/libiio/Config.in"
 	source "package/libinput/Config.in"
 	source "package/libiqrf/Config.in"
package/libhid/0001-dont-fiddle-with-debug-flags.patch deleted +0 -19
deleted file mode 100644
index 44a172877a..0000000000
@@ -1,19 +0,0 @@
-MD_CONF_DEBUGGING changes CFLAGS and CXXFLAGS with a horrible magic so disable
-it to prevent compilation errors.
-
-downloaded from
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch?revision=1.1&view=markup
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-diff -uNr libhid-0.2.16.org/configure.ac libhid-0.2.16/configure.ac
---- libhid-0.2.16.org/configure.ac	2007-04-01 22:32:10.000000000 +0200
-+++ libhid-0.2.16/configure.ac	2014-10-19 21:31:00.550091947 +0200
-@@ -78,7 +78,6 @@
- AC_C_BIGENDIAN
- AC_C_STRINGIZE
- 
--MD_CONF_DEBUGGING
- MD_CONF_COMPILER
- AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux")
- AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd")
package/libhid/0002-no-newline-in-ldflags.patch deleted +0 -22
deleted file mode 100644
index df845ee1f5..0000000000
@@ -1,22 +0,0 @@
-Fix improper usage of macro that introduces a wrong newline
-
-The MD_CONF_FLAGS() macro was used with a final newline that
-introduces an invalid newline in the middle of the macro expansion
-when defining LDFLAGS.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: libhid-0.2.16/configure.ac
-===================================================================
---- libhid-0.2.16.orig/configure.ac	2007-04-01 22:32:10.000000000 +0200
-+++ libhid-0.2.16/configure.ac	2012-12-12 20:24:03.000000000 +0100
-@@ -102,8 +102,7 @@
-   [],
-   [$OS_CFLAGS $LIBUSB_CFLAGS],
-   [],
--  [$OS_LDFLAGS $LIBUSB_LIBS]
--)
-+  [$OS_LDFLAGS $LIBUSB_LIBS])
- 
- MD_CONF_DB2MAN
- 
package/libhid/0003-uclinux.patch deleted +0 -29
deleted file mode 100644
index 9f4502ada9..0000000000
@@ -1,29 +0,0 @@
-Good old 'uclinux is also linux'
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-[Dario: make the patch to be applied with fuzz factor 0]
-Signed-off-by: Dario Binacchi <[email protected]>
-
-diff -Nura libhid-0.2.16.orig/configure.ac libhid-0.2.16/configure.ac
---- libhid-0.2.16.orig/configure.ac	2014-06-22 09:35:50.277261742 -0300
-+++ libhid-0.2.16/configure.ac	2014-06-22 09:36:10.688951947 -0300
-@@ -79,6 +79,7 @@
- AC_C_STRINGIZE
- 
- MD_CONF_COMPILER
-+AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "uclinux")
- AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux")
- AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd")
- AM_CONDITIONAL(OS_SOLARIS, test "$MD_OS" = "solaris")
-diff -Nura libhid-0.2.16.orig/m4/md_check_os.m4 libhid-0.2.16/m4/md_check_os.m4
---- libhid-0.2.16.orig/m4/md_check_os.m4	2014-06-22 09:35:50.275261675 -0300
-+++ libhid-0.2.16/m4/md_check_os.m4	2014-06-22 09:46:17.651475891 -0300
-@@ -3,7 +3,7 @@
-     AC_CANONICAL_HOST
-     AC_MSG_CHECKING(for target OS)
-     case $host in
--      *-linux*)
-+      *-linux*|*-uclinux*)
-         AC_DEFINE(OS_LINUX, [], [define to 1 if building for Linux])
-         AC_SUBST(OS_LINUX)
-         MD_OS=linux
package/libhid/Config.in deleted +0 -14
deleted file mode 100644
index abf338fdc7..0000000000
@@ -1,14 +0,0 @@
-config BR2_PACKAGE_LIBHID
-	bool "libhid"
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	help
-	  Userspace library for accessing USB HID devices
-
-	  https://directory.fsf.org/wiki/Libhid
-
-comment "libhid needs a toolchain w/ threads, gcc >= 4.9"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
package/libhid/libhid.hash deleted +0 -3
deleted file mode 100644
index 933ba22a92..0000000000
@@ -1,3 +0,0 @@
-# locally computed
-sha256  f6809ab3b9c907cbb05ceba9ee6ca23a705f85fd71588518e14b3a7d9f2550e5  libhid-0.2.16.tar.gz
-sha256  231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
package/libhid/libhid.mk deleted +0 -23
deleted file mode 100644
index b2e890c358..0000000000
@@ -1,23 +0,0 @@
-################################################################################
-#
-# libhid
-#
-################################################################################
-
-LIBHID_VERSION = 0.2.16
-LIBHID_SITE = http://sources.buildroot.net
-LIBHID_DEPENDENCIES = libusb-compat libusb
-LIBHID_INSTALL_STAGING = YES
-LIBHID_AUTORECONF = YES
-LIBHID_LICENSE = GPL-2.0
-LIBHID_LICENSE_FILES = COPYING
-# configure runs libusb-config for cflags/ldflags. Ensure it picks up
-# the target version
-LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH)
-LIBHID_CONF_OPTS = \
-	--disable-swig \
-	--disable-werror \
-	--without-doxygen \
-	--disable-package-config
-
-$(eval $(autotools-package))
Signature · 6 lines
2.39.5

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

PATCH 3/3 package/fconfig: drop package

In reply to Peter Korsgaard

The upstream location has been dead for 10 years and there is no reverse dependencies for it, so drop it.

---
 Config.in.legacy             |  7 +++++++
 package/Config.in            |  1 -
 package/fconfig/Config.in    |  6 ------
 package/fconfig/fconfig.hash |  3 ---
 package/fconfig/fconfig.mk   | 22 ----------------------
 5 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 package/fconfig/Config.in
 delete mode 100644 package/fconfig/fconfig.hash
 delete mode 100644 package/fconfig/fconfig.mk
Config.in.legacy +7 -0
index 3636228440..2ef1e19516 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2025.02"
 
+config BR2_PACKAGE_FCONFIG
+	bool "fconfig has been removed"
+	select BR2_LEGACY
+	help
+	  The fconfig package was removed as it is not maintained
+	  anymore and the upstream URL is gone.
+
 config BR2_PACKAGE_LIBHID
 	bool "libhid has been removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index d9af39b900..60cdb179a3 100644
@@ -514,7 +514,6 @@ endmenu
 	source "package/evemu/Config.in"
 	source "package/evtest/Config.in"
 	source "package/fbtft/Config.in"
-	source "package/fconfig/Config.in"
 	source "package/flashrom/Config.in"
 	source "package/fmtools/Config.in"
 	source "package/freeipmi/Config.in"
package/fconfig/Config.in deleted +0 -6
deleted file mode 100644
index e7dd58a84a..0000000000
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_FCONFIG
-	bool "fconfig"
-	help
-	  fconfig - get/set RedBoot configuration parameters from Linux.
-
-	  http://andrzejekiert.ovh.org/software.html.en
package/fconfig/fconfig.hash deleted +0 -3
deleted file mode 100644
index 98e7fbf12b..0000000000
@@ -1,3 +0,0 @@
-# Locally computed
-sha256  4ff0e8f07e35e46b705c0dbe9d9544ede01ea092a69e3f7db03e55a3f2bb8eb7  fconfig-20080329.tar.gz
-sha256  e698a9ea4d6dab0a15d3d6fd354b97b820629244f946529cc7f42b2b8e8f16d0  fconfig.c
package/fconfig/fconfig.mk deleted +0 -22
deleted file mode 100644
index 1e6fbb40b4..0000000000
@@ -1,22 +0,0 @@
-################################################################################
-#
-# fconfig
-#
-################################################################################
-
-FCONFIG_VERSION = 20080329
-# Real upstream location has been disabled
-# FCONFIG_SITE = http://andrzejekiert.ovh.org/software/fconfig
-FCONFIG_SITE = http://sources.buildroot.net
-FCONFIG_LICENSE = GPL-2.0+
-FCONFIG_LICENSE_FILES = fconfig.c
-
-define FCONFIG_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
-endef
-
-define FCONFIG_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/fconfig $(TARGET_DIR)/sbin/fconfig
-endef
-
-$(eval $(generic-package))
Signature · 6 lines
2.39.5

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw
In reply to Peter Korsgaard
Quoted 5 lines · Peter Korsgaard

This was added by commit aa441aa84c38a (openocd: bump to version 0.8.0) ~10 years ago, but openocd 0.8.0 (or any later version) does not contain any libhid support, so drop it.

Series applied to next, thanks.

Quoted 19 lines
---
 package/openocd/openocd.mk | 1 -
 1 file changed, 1 deletion(-)
package/openocd/openocd.mk +0 -2
index 6b9f5541cd..78f872fa76 100644
@@ -55,7 +55,6 @@ OPENOCD_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \
 	$(if $(BR2_PACKAGE_LIBUSB),libusb) \
 	$(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \
-	$(if $(BR2_PACKAGE_LIBHID),libhid) \
 	$(if $(BR2_PACKAGE_HIDAPI),hidapi)
 
 ifeq ($(BR2_PACKAGE_LIBGPIOD),y)
--

2.39.5

Quoted 4 lines

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot