From patchwork Wed Nov 25 06:26:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1405916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=C5l1F86p; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=e+m3O2qb; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CgrZy4bkYz9s0b for ; Wed, 25 Nov 2020 17:29:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=gfcPZ7/px8JySIVr4fB4gHg5L1ujkQTdySIQO+HZkrg=; b=C5l1F86pegw++Z7e1kwoiL7LkB 5/Zbz1SxxTd1pQPu82JB58lCj4qGGsuYfr9o1C7RTD41D1lfVi8Ltd99vzSd50X4JcorhD11qICeI hfOhA3XabY6u3Wrjf/KOUc6C8zdM+DMYrEUfk7gnLGXs6dfijq0xsXFH6Wu2ptepmeG/suTGdGu2k QGGDAvgMMnng8rhIOXg0mQwO3iQdf3GGqU1CTxkOIUZSVhTOdMaJy4d/2VGXcQ3g2RW6JKm2cs4v5 FOdg1Mf5BY6QB1FzDxA01Uy7PvoxArGPpYS40hKdzmIS58g7/A8xC/lYICXepy3ObUZlEWMM71jOA e8CDeQig==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khoG6-0001bt-0r; Wed, 25 Nov 2020 06:26:30 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khoFz-0001bR-Uw for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 06:26:25 +0000 Received: by mail-pf1-x442.google.com with SMTP id w187so1365846pfd.5 for ; Tue, 24 Nov 2020 22:26:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OTGTc6Rx998i3LPppJxiaa01tQQ42J1Gjpydsnosk5Y=; b=e+m3O2qb5Fn/OvcOqJxWIGwn2WXK4AI4UpsnLbTRcZy31EMmhopfdT1Z7bi4yhkWo/ WSZ0NJaje9zG5JXjq7hG0c4yh986smpanWsKeunR9qpsgVj5TL3IsCGVdda6W6rutyo2 B6159bj8knJyN//PIoF9ijfsBkesDZ4EhlxUw435m6sOtsNxJINYf0DG8CX5ioigEdX4 9vKzRRjYPMdDGfcwPaCpQ7XgmbYzORw6zMeJdbyfCrMR+hBa4J3BXHUtn/yxGnln6vzQ ZbGHfUwZgcHYFCnNRAFGQl3lpTpZihtFgRB3NRa/cY0+Iu9VicsScnJ3/zfia0Xwa12H W8gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OTGTc6Rx998i3LPppJxiaa01tQQ42J1Gjpydsnosk5Y=; b=iz2bd2lbcCHMo5eP8mOtPoD7YaLWPqi7UrCGUuIAI6YQz1BtX9ST+HQf0HAqndZJns A8jhargKK8FePQgP+/pvTI0f5qqrb9LsbHOpyHiVRo1fPnXxtd9hp5zopEEbWu61ETmb w8qBIQhjICTGUo7wrUgNjCy0/dktkscHYZknMcwWxdhXP5ieUi29M0N9tTWIaP+q229H zGJ6wGJYoY3qnUvKL2fv2rATlBPZOda10TPfm22nWvSy2cqjbYacGL2eC7Z+UHn1eq2G cft1vEpXQ0Ho0+/ZXkvu4P4OjyAlxaJpuGXJJgnuTJLqAJOu7Ysz0rhLFdATB64Xwj5S IO8Q== X-Gm-Message-State: AOAM530yqbqmiysTvVM6fVs47+/puCX7S/NvDAF/d0yeEZrqhHvo6XRT Y1OnONPcyuQkqL7JTkAoZnCrAVtg43CVxw== X-Google-Smtp-Source: ABdhPJzJogbCMqV2Q2/hSfk0EufLOuF1vVoL/dpq/rSIhk5zsMqa76k5J8mB8scil6YeCtDYivd+9g== X-Received: by 2002:a17:90b:1057:: with SMTP id gq23mr2380942pjb.179.1606285579737; Tue, 24 Nov 2020 22:26:19 -0800 (PST) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id i3sm1343697pjd.33.2020.11.24.22.26.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 22:26:18 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] libusb-compat: remove Date: Tue, 24 Nov 2020 22:26:17 -0800 Message-Id: <20201125062617.272916-1-rosenp@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_012624_022384_FB53EE1E X-CRM114-Status: GOOD ( 14.44 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:442 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org No package in base relies on this library. This library will be moved to packages where it is needed. Signed-off-by: Rosen Penev --- package/libs/libusb-compat/Makefile | 54 ----- .../patches/001-fix-musl-stdint.patch | 185 ------------------ 2 files changed, 239 deletions(-) delete mode 100644 package/libs/libusb-compat/Makefile delete mode 100644 package/libs/libusb-compat/patches/001-fix-musl-stdint.patch diff --git a/package/libs/libusb-compat/Makefile b/package/libs/libusb-compat/Makefile deleted file mode 100644 index 5f9b2385c8..0000000000 --- a/package/libs/libusb-compat/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (C) 2010-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libusb-compat -PKG_VERSION:=0.1.5 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/libusb -PKG_HASH:=404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a - -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 -PKG_LICENSE:=LGPL-2.1 - -PKG_MAINTAINER := Felix Fietkau - -include $(INCLUDE_DIR)/package.mk - -define Package/libusb-compat - SECTION:=libs - CATEGORY:=Libraries - TITLE:=libusb-0.1 compatibility library - DEPENDS:=+libusb-1.0 - URL:=http://libusb.wiki.sourceforge.net/ - ABI_VERSION:=4 -endef - -define Package/libusb-compat/description - libusb is a C library that gives applications easy access to USB devices on - many different operating systems. -endef - -TARGET_CFLAGS += $(FPIC) - -define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - $(INSTALL_DIR) $(2)/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(2)/bin/ -endef - -define Package/libusb-compat/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb-0.1.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libusb-compat)) diff --git a/package/libs/libusb-compat/patches/001-fix-musl-stdint.patch b/package/libs/libusb-compat/patches/001-fix-musl-stdint.patch deleted file mode 100644 index 333bc090cc..0000000000 --- a/package/libs/libusb-compat/patches/001-fix-musl-stdint.patch +++ /dev/null @@ -1,185 +0,0 @@ ---- a/libusb/usb.h -+++ b/libusb/usb.h -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - - #include -@@ -78,40 +79,40 @@ - - /* All standard descriptors have these 2 fields in common */ - struct usb_descriptor_header { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -+ uint8_t bLength; -+ uint8_t bDescriptorType; - }; - - /* String descriptor */ - struct usb_string_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t wData[1]; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t wData[1]; - }; - - /* HID descriptor */ - struct usb_hid_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t bcdHID; -- u_int8_t bCountryCode; -- u_int8_t bNumDescriptors; -- /* u_int8_t bReportDescriptorType; */ -- /* u_int16_t wDescriptorLength; */ -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t bcdHID; -+ uint8_t bCountryCode; -+ uint8_t bNumDescriptors; -+ /* uint8_t bReportDescriptorType; */ -+ /* uint16_t wDescriptorLength; */ - /* ... */ - }; - - /* Endpoint descriptor */ - #define USB_MAXENDPOINTS 32 - struct usb_endpoint_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int8_t bEndpointAddress; -- u_int8_t bmAttributes; -- u_int16_t wMaxPacketSize; -- u_int8_t bInterval; -- u_int8_t bRefresh; -- u_int8_t bSynchAddress; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint8_t bEndpointAddress; -+ uint8_t bmAttributes; -+ uint16_t wMaxPacketSize; -+ uint8_t bInterval; -+ uint8_t bRefresh; -+ uint8_t bSynchAddress; - - unsigned char *extra; /* Extra descriptors */ - int extralen; -@@ -129,15 +130,15 @@ struct usb_endpoint_descriptor { - /* Interface descriptor */ - #define USB_MAXINTERFACES 32 - struct usb_interface_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int8_t bInterfaceNumber; -- u_int8_t bAlternateSetting; -- u_int8_t bNumEndpoints; -- u_int8_t bInterfaceClass; -- u_int8_t bInterfaceSubClass; -- u_int8_t bInterfaceProtocol; -- u_int8_t iInterface; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint8_t bInterfaceNumber; -+ uint8_t bAlternateSetting; -+ uint8_t bNumEndpoints; -+ uint8_t bInterfaceClass; -+ uint8_t bInterfaceSubClass; -+ uint8_t bInterfaceProtocol; -+ uint8_t iInterface; - - struct usb_endpoint_descriptor *endpoint; - -@@ -155,14 +156,14 @@ struct usb_interface { - /* Configuration descriptor information.. */ - #define USB_MAXCONFIG 8 - struct usb_config_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t wTotalLength; -- u_int8_t bNumInterfaces; -- u_int8_t bConfigurationValue; -- u_int8_t iConfiguration; -- u_int8_t bmAttributes; -- u_int8_t MaxPower; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t wTotalLength; -+ uint8_t bNumInterfaces; -+ uint8_t bConfigurationValue; -+ uint8_t iConfiguration; -+ uint8_t bmAttributes; -+ uint8_t MaxPower; - - struct usb_interface *interface; - -@@ -172,28 +173,28 @@ struct usb_config_descriptor { - - /* Device descriptor */ - struct usb_device_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t bcdUSB; -- u_int8_t bDeviceClass; -- u_int8_t bDeviceSubClass; -- u_int8_t bDeviceProtocol; -- u_int8_t bMaxPacketSize0; -- u_int16_t idVendor; -- u_int16_t idProduct; -- u_int16_t bcdDevice; -- u_int8_t iManufacturer; -- u_int8_t iProduct; -- u_int8_t iSerialNumber; -- u_int8_t bNumConfigurations; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t bcdUSB; -+ uint8_t bDeviceClass; -+ uint8_t bDeviceSubClass; -+ uint8_t bDeviceProtocol; -+ uint8_t bMaxPacketSize0; -+ uint16_t idVendor; -+ uint16_t idProduct; -+ uint16_t bcdDevice; -+ uint8_t iManufacturer; -+ uint8_t iProduct; -+ uint8_t iSerialNumber; -+ uint8_t bNumConfigurations; - }; - - struct usb_ctrl_setup { -- u_int8_t bRequestType; -- u_int8_t bRequest; -- u_int16_t wValue; -- u_int16_t wIndex; -- u_int16_t wLength; -+ uint8_t bRequestType; -+ uint8_t bRequest; -+ uint16_t wValue; -+ uint16_t wIndex; -+ uint16_t wLength; - }; - - /* -@@ -254,7 +255,7 @@ struct usb_device { - - void *dev; /* Darwin support */ - -- u_int8_t devnum; -+ uint8_t devnum; - - unsigned char num_children; - struct usb_device **children; -@@ -266,7 +267,7 @@ struct usb_bus { - char dirname[PATH_MAX + 1]; - - struct usb_device *devices; -- u_int32_t location; -+ uint32_t location; - - struct usb_device *root_dev; - };