summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-27 12:48:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-30 12:44:35 +0100
commite36e17edeec1632e1577eb56a88b830b94600225 (patch)
treee223a809035a8c11c0ac5afc4445f54d32db566a /meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
parentebe85aa97869ac0a69fd77190ab2e0c54e90106f (diff)
downloadpoky-e36e17edeec1632e1577eb56a88b830b94600225.tar.gz
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. (From OE-Core rev: 889a86d8c044c0a9c6064a542f25e7fecef48234) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch')
-rw-r--r--meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch32
1 files changed, 16 insertions, 16 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 @@
1From 333d5fbbc03481f1aa222bd68c2609db168ae3e0 Mon Sep 17 00:00:00 2001 1Upstream-Status: Backport (https://github.com/gregkh/usbutils/commit/508d1acf42e1bfd470c6bf1a188574c69c20aeed)
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2Signed-off-by: Ross Burton <ross.burton@intel.com>
3Date: Thu, 26 Jul 2012 10:37:32 +0100
4Subject: [PATCH] usb-devices: avoid dependency on bash
5 3
6By virtue of having #!/bin/bash this script declared that it requires 4From 1c9162a5b30550aec8fa163906067bc179291b57 Mon Sep 17 00:00:00 2001
7bash, however manual examination, checkbashisms and tests with dash 5From: Ross Burton <ross.burton@intel.com>
8and busybox show that it doesn't contain any bashisms, so change the 6Date: Fri, 27 Jul 2018 15:28:34 +0100
9header to avoid the dependency. 7Subject: [PATCH] usb-devices: use /bin/sh
10 8
11Upstream-Status: Pending 9This script doesn't use any bashisms, so change the hashbang to /bin/sh.
12 10
13Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 11Fixes #73.
12
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14--- 14---
15 usb-devices | 2 +- 15 usb-devices | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/usb-devices b/usb-devices 18diff --git a/usb-devices b/usb-devices
19index b2052e2..14a5358 100755 19index afb4217..89d1b7d 100755
20--- a/usb-devices 20--- a/usb-devices
21+++ b/usb-devices 21+++ b/usb-devices
22@@ -1,4 +1,4 @@ 22@@ -1,4 +1,4 @@
23-#!/bin/bash 23-#!/bin/bash
24+#!/bin/sh 24+#!/bin/sh
25 25 # SPDX-License-Identifier: GPL-2.0+
26 # Copyright: 2009 Greg Kroah-Hartman <greg@kroah.com> 26 #
27 # 2009 Randy Dunlap <rdunlap@xenotime.net> 27 # Copyright (c) 2009 Greg Kroah-Hartman <greg@kroah.com>
28-- 28--
291.7.9.5 292.11.0
30 30