usbutils: upgrade to 010

Upgrade to 010.

usbutils uses libusb1 not the older libusb-compat library.

Refresh (and submit upstream) the bashism removal for usb-devices.

Fix LICENSE as lsusb.py is GPLv2 or v3, and set per-package LICENSE fields as
appropriate.  The actual license texts are missing from the 010 tarball (fixed
in git) so point at the SPDX statements in the source files instead.

Remove FILES_${PN}-dev as usbutils.pc doesn't exist anymore.

Remove lsusb.py hashbang change as this doesn't cause any problems now
(installed hashbang is /usr/bin/env python3).

Remove spurious zlib build dependency that isn't required.

Remove spurious RDEPENDS_${PN}-ptest, which doesn't exist.

Signed-off-by: Ross Burton <ross.burton@intel.com>

2 files changed, 26 insertions, 28 deletions

diff --git a/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch b/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
index a6b241f854..7edff2614a 100644
--- a/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
+++ b/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
@@ -1,30 +1,30 @@
-From 333d5fbbc03481f1aa222bd68c2609db168ae3e0 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Thu, 26 Jul 2012 10:37:32 +0100
-Subject: [PATCH] usb-devices: avoid dependency on bash
+Upstream-Status: Backport (https://github.com/gregkh/usbutils/commit/508d1acf42e1bfd470c6bf1a188574c69c20aeed)
+Signed-off-by: Ross Burton <ross.burton@intel.com>
 
-By virtue of having #!/bin/bash this script declared that it requires
-bash, however manual examination, checkbashisms and tests with dash
-and busybox show that it doesn't contain any bashisms, so change the
-header to avoid the dependency.
+From 1c9162a5b30550aec8fa163906067bc179291b57 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Fri, 27 Jul 2018 15:28:34 +0100
+Subject: [PATCH] usb-devices: use /bin/sh
 
-Upstream-Status: Pending
+This script doesn't use any bashisms, so change the hashbang to /bin/sh.
 
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Fixes #73.
+
+Signed-off-by: Ross Burton <ross.burton@intel.com>
 ---
- usb-devices |    2 +-
+ usb-devices | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/usb-devices b/usb-devices
-index b2052e2..14a5358 100755
+index afb4217..89d1b7d 100755
 --- a/usb-devices
 +++ b/usb-devices
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
- 
- # Copyright: 2009 Greg Kroah-Hartman <greg@kroah.com>
- #            2009 Randy Dunlap <rdunlap@xenotime.net>
+ # SPDX-License-Identifier: GPL-2.0+
+ #
+ # Copyright (c) 2009 Greg Kroah-Hartman <greg@kroah.com>
 -- 
-1.7.9.5
+2.11.0
 
diff --git a/meta/recipes-bsp/usbutils/usbutils_009.bb b/meta/recipes-bsp/usbutils/usbutils_010.bb
index 3ffc0dd97a..e6d05b8e87 100644
--- a/meta/recipes-bsp/usbutils/usbutils_009.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_010.bb
@@ -3,32 +3,30 @@ DESCRIPTION = "Contains the lsusb utility for inspecting the devices connected t
 HOMEPAGE = "http://www.linux-usb.org"
 SECTION = "base"
 
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+LICENSE = "GPLv2+ & (GPLv2 | GPLv3)"
+# License files went missing in 010, when 011 is released add LICENSES/* back
+LIC_FILES_CHKSUM = "file://lsusb.c;endline=1;md5=7d4861d978ff5ba7cb2b319ed1d4afe3 \
+                    file://lsusb.py.in;beginline=2;endline=2;md5=194d6a0226bf90f4f683e8968878b6cd"
 
-DEPENDS = "libusb zlib virtual/libiconv udev"
+DEPENDS = "libusb1 virtual/libiconv udev"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
            file://usb-devices-avoid-dependency-on-bash.patch \
           "
-
-SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad"
-SRC_URI[sha256sum] = "e73543293a17c7803994eac97a49e58b377e08e6299ba11aad09794b91340e8b"
+SRC_URI[md5sum] = "5eb2d2d68f9ed6dc3e9659a5988f7ed6"
+SRC_URI[sha256sum] = "881ba47fb2df10c3ba54a4cd6755a90377180890788e476f99d480ea9bc8bb58"
 
 inherit autotools pkgconfig distro_features_check update-alternatives
 
 ALTERNATIVE_${PN} = "lsusb"
 ALTERNATIVE_PRIORITY = "100"
 
-FILES_${PN}-dev += "${datadir}/pkgconfig"
+# The binaries are mostly GPLv2+ apart from lsusb.py which is GPLv2 or v3.
+LICENSE_${PN} = "GPLv2+"
+LICENSE_${PN}-python = "GPLv2 | GPLv3"
 
 RRECOMMENDS_${PN} = "udev-hwdb"
-RDEPENDS_${PN}-ptest = "libboost-system libboost-thread"
 
 PACKAGE_BEFORE_PN =+ "${PN}-python"
 FILES_${PN}-python += "${bindir}/lsusb.py"
 RDEPENDS_${PN}-python = "python3-core"
-
-do_install_append() {
-    sed -i -E '1s,#!.+python,#!${bindir}/python3,' ${D}${bindir}/lsusb.py
-}