summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch32
-rw-r--r--meta/recipes-bsp/usbutils/usbutils_010.bb (renamed from meta/recipes-bsp/usbutils/usbutils_009.bb)22
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 @@
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
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
3HOMEPAGE = "http://www.linux-usb.org" 3HOMEPAGE = "http://www.linux-usb.org"
4SECTION = "base" 4SECTION = "base"
5 5
6LICENSE = "GPLv2+" 6LICENSE = "GPLv2+ & (GPLv2 | GPLv3)"
7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 7# License files went missing in 010, when 011 is released add LICENSES/* back
8LIC_FILES_CHKSUM = "file://lsusb.c;endline=1;md5=7d4861d978ff5ba7cb2b319ed1d4afe3 \
9 file://lsusb.py.in;beginline=2;endline=2;md5=194d6a0226bf90f4f683e8968878b6cd"
8 10
9DEPENDS = "libusb zlib virtual/libiconv udev" 11DEPENDS = "libusb1 virtual/libiconv udev"
10 12
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ 13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
12 file://usb-devices-avoid-dependency-on-bash.patch \ 14 file://usb-devices-avoid-dependency-on-bash.patch \
13 " 15 "
14 16SRC_URI[md5sum] = "5eb2d2d68f9ed6dc3e9659a5988f7ed6"
15SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad" 17SRC_URI[sha256sum] = "881ba47fb2df10c3ba54a4cd6755a90377180890788e476f99d480ea9bc8bb58"
16SRC_URI[sha256sum] = "e73543293a17c7803994eac97a49e58b377e08e6299ba11aad09794b91340e8b"
17 18
18inherit autotools pkgconfig distro_features_check update-alternatives 19inherit autotools pkgconfig distro_features_check update-alternatives
19 20
20ALTERNATIVE_${PN} = "lsusb" 21ALTERNATIVE_${PN} = "lsusb"
21ALTERNATIVE_PRIORITY = "100" 22ALTERNATIVE_PRIORITY = "100"
22 23
23FILES_${PN}-dev += "${datadir}/pkgconfig" 24# The binaries are mostly GPLv2+ apart from lsusb.py which is GPLv2 or v3.
25LICENSE_${PN} = "GPLv2+"
26LICENSE_${PN}-python = "GPLv2 | GPLv3"
24 27
25RRECOMMENDS_${PN} = "udev-hwdb" 28RRECOMMENDS_${PN} = "udev-hwdb"
26RDEPENDS_${PN}-ptest = "libboost-system libboost-thread"
27 29
28PACKAGE_BEFORE_PN =+ "${PN}-python" 30PACKAGE_BEFORE_PN =+ "${PN}-python"
29FILES_${PN}-python += "${bindir}/lsusb.py" 31FILES_${PN}-python += "${bindir}/lsusb.py"
30RDEPENDS_${PN}-python = "python3-core" 32RDEPENDS_${PN}-python = "python3-core"
31
32do_install_append() {
33 sed -i -E '1s,#!.+python,#!${bindir}/python3,' ${D}${bindir}/lsusb.py
34}