summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/usbutils
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-26 11:51:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 18:53:04 +0100
commit0565ae44d9bc89efd17f38938a0ba8185bc7c6e7 (patch)
tree3b85f05f911425b7b94e94567775910fd8d6038c /meta/recipes-bsp/usbutils
parente95738004f20205e98982e9b341d1b845f65ff28 (diff)
downloadpoky-0565ae44d9bc89efd17f38938a0ba8185bc7c6e7.tar.gz
usbutils: avoid dependency on bash
By virtue of having #!/bin/bash, the usb-devices 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 script's header and remove the RDEPENDS on bash. Additionally, update-usbids.sh was manually checked for bashisms, run through checkbashisms and tested with busybox (although it did not have a bash-specific header). (From OE-Core rev: 651b223c5fc93c7504e304e954b9ae4640ed47c6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/usbutils')
-rw-r--r--meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch30
-rw-r--r--meta/recipes-bsp/usbutils/usbutils_0.91.bb7
2 files changed, 34 insertions, 3 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
new file mode 100644
index 0000000000..a6b241f854
--- /dev/null
+++ b/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
@@ -0,0 +1,30 @@
1From 333d5fbbc03481f1aa222bd68c2609db168ae3e0 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Thu, 26 Jul 2012 10:37:32 +0100
4Subject: [PATCH] usb-devices: avoid dependency on bash
5
6By virtue of having #!/bin/bash this script declared that it requires
7bash, however manual examination, checkbashisms and tests with dash
8and busybox show that it doesn't contain any bashisms, so change the
9header to avoid the dependency.
10
11Upstream-Status: Pending
12
13Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
14---
15 usb-devices | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/usb-devices b/usb-devices
19index b2052e2..14a5358 100755
20--- a/usb-devices
21+++ b/usb-devices
22@@ -1,4 +1,4 @@
23-#!/bin/bash
24+#!/bin/sh
25
26 # Copyright: 2009 Greg Kroah-Hartman <greg@kroah.com>
27 # 2009 Randy Dunlap <rdunlap@xenotime.net>
28--
291.7.9.5
30
diff --git a/meta/recipes-bsp/usbutils/usbutils_0.91.bb b/meta/recipes-bsp/usbutils/usbutils_0.91.bb
index 490b05a807..04d1681e1d 100644
--- a/meta/recipes-bsp/usbutils/usbutils_0.91.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_0.91.bb
@@ -7,9 +7,10 @@ LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
8 8
9DEPENDS = "libusb zlib" 9DEPENDS = "libusb zlib"
10PR = "r3" 10PR = "r4"
11 11
12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz" 12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
13 file://usb-devices-avoid-dependency-on-bash.patch"
13 14
14SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb" 15SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb"
15SRC_URI[sha256sum] = "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46" 16SRC_URI[sha256sum] = "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46"
@@ -26,4 +27,4 @@ PACKAGES += "${PN}-ids"
26FILES_${PN}-dev += "${datadir}/pkgconfig" 27FILES_${PN}-dev += "${datadir}/pkgconfig"
27FILES_${PN}-ids = "${datadir}/usb*" 28FILES_${PN}-ids = "${datadir}/usb*"
28 29
29RDEPENDS_${PN} = "${PN}-ids bash" 30RDEPENDS_${PN} = "${PN}-ids"