From: Robert Marko Date: Mon, 26 May 2025 17:06:33 +0000 (+0200) Subject: usb-serial-xr_usb_serial_common: remove package X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=2c78935539f06d1b4c48a358e95ff2e0fcdbeab5;p=feed%2Fpackages.git usb-serial-xr_usb_serial_common: remove package Now that we have packaged the upstream driver[1] and only board[2] that includes it by default has been switched to it, remove this out-of-tree driver that is broken on 6.12 anyway. [1] https://github.com/openwrt/openwrt/commit/d39d626b23756fe574ad46e093f5a796b1861b17 [2] https://github.com/openwrt/openwrt/commit/200a31b6f5ec7a46e5556b55d4e45a74fb5d6167 Signed-off-by: Robert Marko --- diff --git a/libs/xr_usb_serial_common/Makefile b/libs/xr_usb_serial_common/Makefile deleted file mode 100644 index 85348c21e3..0000000000 --- a/libs/xr_usb_serial_common/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=usb-serial-xr_usb_serial_common -PKG_SOURCE_DATE:=2023-03-21 -PKG_SOURCE_VERSION:=90ad530166f096347a5a57b6f9eb21c422a40fd9 -PKG_RELEASE:=3 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/kasbert/epsolar-tracer -PKG_MIRROR_HASH:=0907dfbcb18cc0b2ff3e2af79eb7943c5215ec176db994a89832aef606c98a1a - -PKG_MAINTAINER:=Daniel Golle -PKG_LICENSE:=GPL-2.0-or-later -PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define KernelPackage/usb-serial-xr_usb_serial_common - SECTION:=kernel - CATEGORY:=Kernel modules - SUBMENU:=USB Support - TITLE:=Support for Exar USB to RS-485/RS-422 - URL:=https://www.exar.com/content/document.ashx?id=21651 - FILES:=$(PKG_BUILD_DIR)/xr_usb_serial_common-1a/xr_usb_serial_common.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoProbe,xr_usb_serial_common) - DEPENDS+=kmod-usb-serial -endef - -define Build/Compile - +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - M="$(PKG_BUILD_DIR)/xr_usb_serial_common-1a" \ - modules -endef - -$(eval $(call KernelPackage,usb-serial-xr_usb_serial_common)) diff --git a/libs/xr_usb_serial_common/patches/0001-fix-kernel-6.6-builds.patch b/libs/xr_usb_serial_common/patches/0001-fix-kernel-6.6-builds.patch deleted file mode 100644 index beb3188a2b..0000000000 --- a/libs/xr_usb_serial_common/patches/0001-fix-kernel-6.6-builds.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5115918c11cc99e93586cef7f33d8d3907b7258a Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Wed, 3 Apr 2024 12:45:41 -0600 -Subject: [PATCH] Support Linux >= 6.2.0 - -FROM: https://github.com/kasbert/epsolar-tracer/pull/61 - -Signed-off-by: Adam Duskett ---- - xr_usb_serial_common-1a/xr_usb_serial_common.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - ---- a/xr_usb_serial_common-1a/xr_usb_serial_common.c -+++ b/xr_usb_serial_common-1a/xr_usb_serial_common.c -@@ -643,8 +643,13 @@ static void xr_usb_serial_tty_close(stru - tty_port_close(&xr_usb_serial->port, tty, filp); - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0) -+static ssize_t xr_usb_serial_tty_write(struct tty_struct *tty, -+ const unsigned char *buf, size_t count) -+#else - static int xr_usb_serial_tty_write(struct tty_struct *tty, - const unsigned char *buf, int count) -+#endif - { - struct xr_usb_serial *xr_usb_serial = tty->driver_data; - int stat; -@@ -655,7 +660,11 @@ static int xr_usb_serial_tty_write(struc - if (!count) - return 0; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0) -+ dev_vdbg(&xr_usb_serial->data->dev, "%s - count %zd\n", __func__, count); -+#else - dev_vdbg(&xr_usb_serial->data->dev, "%s - count %d\n", __func__, count); -+#endif - - spin_lock_irqsave(&xr_usb_serial->write_lock, flags); - wbn = xr_usb_serial_wb_alloc(xr_usb_serial); -@@ -672,7 +681,11 @@ static int xr_usb_serial_tty_write(struc - } - - count = (count > xr_usb_serial->writesize) ? xr_usb_serial->writesize : count; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0) -+ dev_vdbg(&xr_usb_serial->data->dev, "%s - write %zd\n", __func__, count); -+#else - dev_vdbg(&xr_usb_serial->data->dev, "%s - write %d\n", __func__, count); -+#endif - memcpy(wb->buf, buf, count); - wb->len = count; -