diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-07-26 11:51:28 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-26 18:53:04 +0100 |
| commit | 0565ae44d9bc89efd17f38938a0ba8185bc7c6e7 (patch) | |
| tree | 3b85f05f911425b7b94e94567775910fd8d6038c /meta/recipes-bsp/usbutils | |
| parent | e95738004f20205e98982e9b341d1b845f65ff28 (diff) | |
| download | openembedded-core-contrib-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.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-bsp/usbutils/usbutils_0.91.bb | 7 |
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 @@ +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 + +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. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + usb-devices | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usb-devices b/usb-devices +index b2052e2..14a5358 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> +-- +1.7.9.5 + 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+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libusb zlib" -PR = "r3" +PR = "r4" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ + file://usb-devices-avoid-dependency-on-bash.patch" SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb" SRC_URI[sha256sum] = "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46" @@ -26,4 +27,4 @@ PACKAGES += "${PN}-ids" FILES_${PN}-dev += "${datadir}/pkgconfig" FILES_${PN}-ids = "${datadir}/usb*" -RDEPENDS_${PN} = "${PN}-ids bash" +RDEPENDS_${PN} = "${PN}-ids" |