diff mbox series

usbutils: Update to version 018

Message ID 20241029182747.353739-1-festevam@gmail.com
State New
Headers show
Series usbutils: Update to version 018 | expand

Commit Message

Fabio Estevam Oct. 29, 2024, 6:27 p.m. UTC 
From: Fabio Estevam <festevam@denx.de>

Update to version 018, which has been converted to meson.

Patch 0001-usbutils.pc.in-Fix-Cflags-entry.patch is no longer needed
as usbutils now uses meson.

Patch 0001-usb-devices-Fix-usb-devices-with-busybox.patch has been
upstreamed.

Add CC0-1.0, LGPL-2.1-or-later, and MIT to the LICENSES entry
due to the following usbutils commits:

https://github.com/gregkh/usbutils/commit/32154d0dbea27fc1de8ad07da9110c5ec5f141d8

https://github.com/gregkh/usbutils/commit/d04e63e5517f89d508b3a206c6611edafc82ac8f

License-Update: Add CC0-1.0, LGPL-2.1-or-later, and MIT entries.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 ...devices-Fix-usb-devices-with-busybox.patch | 37 -------------------
 ...0001-usbutils.pc.in-Fix-Cflags-entry.patch | 34 -----------------
 .../{usbutils_017.bb => usbutils_018.bb}      | 20 +++++-----
 3 files changed, 10 insertions(+), 81 deletions(-)
 delete mode 100755 meta/recipes-bsp/usbutils/usbutils/0001-usb-devices-Fix-usb-devices-with-busybox.patch
 delete mode 100644 meta/recipes-bsp/usbutils/usbutils/0001-usbutils.pc.in-Fix-Cflags-entry.patch
 rename meta/recipes-bsp/usbutils/{usbutils_017.bb => usbutils_018.bb} (50%)
diff mbox series

Patch

diff --git a/meta/recipes-bsp/usbutils/usbutils/0001-usb-devices-Fix-usb-devices-with-busybox.patch b/meta/recipes-bsp/usbutils/usbutils/0001-usb-devices-Fix-usb-devices-with-busybox.patch
deleted file mode 100755
index dbe5d7c18b6d..000000000000
--- a/meta/recipes-bsp/usbutils/usbutils/0001-usb-devices-Fix-usb-devices-with-busybox.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-From da155d965a34b5c5770dc30fa52eb7ef405f3a30 Mon Sep 17 00:00:00 2001
-From: Teresa Remmet <t.remmet@phytec.de>
-Date: Thu, 5 Sep 2024 08:37:48 +0200
-Subject: [PATCH] usb-devices: Fix usb-devices with busybox
-
-The busybox find command is missing the -printf parameter leading to
-the error:
-
-find: unrecognized: -printf
-
-Replace the parameter with sed.
-
-This patch was originally created by Daniel Fancsali.
-
-Upstream-Status: Backport [https://github.com/gregkh/usbutils/commit/da155d965a34b5c5770dc30fa52eb7ef405f3a30]
-
-Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
----
- usb-devices | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usb-devices b/usb-devices
-index 5f60ad5a1ed0..51f48b4ad628 100755
---- a/usb-devices
-+++ b/usb-devices
-@@ -192,7 +192,7 @@ if [ ! -d /sys/bus ]; then
- 	exit 1
- fi
- 
--for device in $(find /sys/bus/usb/devices -name 'usb*' -printf '%f\n' | sort -V)
-+for device in $(find /sys/bus/usb/devices -name 'usb*' | sed -E 's#^.*/##g' | sort -V)
- do
- 	print_device "/sys/bus/usb/devices/$device" 0 0 0
- done
--- 
-2.34.1
-
diff --git a/meta/recipes-bsp/usbutils/usbutils/0001-usbutils.pc.in-Fix-Cflags-entry.patch b/meta/recipes-bsp/usbutils/usbutils/0001-usbutils.pc.in-Fix-Cflags-entry.patch
deleted file mode 100644
index 039dd5cd7235..000000000000
--- a/meta/recipes-bsp/usbutils/usbutils/0001-usbutils.pc.in-Fix-Cflags-entry.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From f558919e858453a31313a3df35906de2e036940c Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <festevam@denx.de>
-Date: Thu, 4 Jan 2024 03:32:11 +0100
-Subject: [PATCH] usbutils.pc.in: Fix Cflags entry
-
-When updating the usbutils version in OpenEmbedded from 015 to 017,
-the following QA error is seen:
-
-QA Issue: File /usr/lib/pkgconfig/usbutils.pc in package usbutils-dev contains reference to TMPDIR [buildpaths]
-
-As this causes reproducibility problem due to the host PC path being
-leaked, it is treated as error.
-
-Fix it by using the standard Cflags entry.
-
-Upstream-Status: Submitted [https://github.com/gregkh/usbutils/pull/184/commits/3b3e5e1ebea7060bfa118d25a91b816dfa176b31]
-Signed-off-by: Fabio Estevam <festevam@denx.de>
----
- usbutils.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usbutils.pc.in b/usbutils.pc.in
-index e69778c3195c..0aa0005de951 100644
---- a/usbutils.pc.in
-+++ b/usbutils.pc.in
-@@ -15,4 +15,4 @@ Requires: libusb-1.0 >= 1.0.14  libudev >= 196
- Conflicts:
- Libs: -L${libdir}
- Libs.private: @LIBUSB_LIBS@ @UDEV_LIBS@
--Cflags: @CFLAGS@ @LIBUSB_CFLAGS@ @UDEV_CFLAGS@
-+Cflags: -I${includedir}
--- 
-2.34.1
-
diff --git a/meta/recipes-bsp/usbutils/usbutils_017.bb b/meta/recipes-bsp/usbutils/usbutils_018.bb
similarity index 50%
rename from meta/recipes-bsp/usbutils/usbutils_017.bb
rename to meta/recipes-bsp/usbutils/usbutils_018.bb
index 83d5c7287d44..b96a1b4f19c7 100644
--- a/meta/recipes-bsp/usbutils/usbutils_017.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_018.bb
@@ -3,21 +3,21 @@  DESCRIPTION = "Contains the lsusb utility for inspecting the devices connected t
 HOMEPAGE = "http://www.linux-usb.org"
 SECTION = "base"
 
-LICENSE = "GPL-2.0-or-later & (GPL-2.0-only | GPL-3.0-only)"
-# License files went missing in 010, when 011 is released add LICENSES/* back
-LIC_FILES_CHKSUM = "file://lsusb.c;endline=1;md5=7226e442a172bcf25807246d7ef1eba1 \
-                    file://lsusb.py.in;beginline=2;endline=2;md5=c443ada211d701156e42ea36d41625b3 \
-                    "
-
+LICENSE = "GPL-2.0-or-later & (GPL-2.0-only | GPL-3.0-only) & CC0-1.0 & LGPL-2.1-or-later & MIT"
+LIC_FILES_CHKSUM = "file://LICENSES/CC0-1.0.txt;md5=cf1af55fc6f5b9a23e12086005298dcd \
+		    file://LICENSES/GPL-2.0-only.txt;md5=c89d4ad08368966d8df5a90ea96bebe4 \
+		    file://LICENSES/GPL-2.0-or-later.txt;md5=c89d4ad08368966d8df5a90ea96bebe4 \
+		    file://LICENSES/GPL-3.0-only.txt;md5=050f496cfea7876fc13cdea643e041e0 \
+		    file://LICENSES/LGPL-2.1-or-later.txt;md5=8c6e7513c570546f65ae570dae278c17 \
+		    file://LICENSES/MIT.txt;md5=e8f57dd048e186199433be2c41bd3d6d \
+                   "
 DEPENDS = "libusb1 virtual/libiconv udev"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
-           file://0001-usbutils.pc.in-Fix-Cflags-entry.patch \
-           file://0001-usb-devices-Fix-usb-devices-with-busybox.patch \
           "
-SRC_URI[sha256sum] = "f704c4cb78a060db88b43aac6ebfd3d93c2c5cf1d6dd0e42936faaf00814ab00"
+SRC_URI[sha256sum] = "0048d2d8518fb0cc7c0516e16e52af023e52b55ddb3b2068a77041b5ef285768"
 
-inherit autotools pkgconfig update-alternatives
+inherit meson pkgconfig update-alternatives
 
 ALTERNATIVE:${PN} = "lsusb"
 ALTERNATIVE_PRIORITY = "100"