diff options
-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 @@ | |||
1 | From 333d5fbbc03481f1aa222bd68c2609db168ae3e0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Thu, 26 Jul 2012 10:37:32 +0100 | ||
4 | Subject: [PATCH] usb-devices: avoid dependency on bash | ||
5 | |||
6 | By virtue of having #!/bin/bash this script declared that it requires | ||
7 | bash, however manual examination, checkbashisms and tests with dash | ||
8 | and busybox show that it doesn't contain any bashisms, so change the | ||
9 | header to avoid the dependency. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
14 | --- | ||
15 | usb-devices | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/usb-devices b/usb-devices | ||
19 | index 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 | -- | ||
29 | 1.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+" | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
8 | 8 | ||
9 | DEPENDS = "libusb zlib" | 9 | DEPENDS = "libusb zlib" |
10 | PR = "r3" | 10 | PR = "r4" |
11 | 11 | ||
12 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz" | 12 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ |
13 | file://usb-devices-avoid-dependency-on-bash.patch" | ||
13 | 14 | ||
14 | SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb" | 15 | SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb" |
15 | SRC_URI[sha256sum] = "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46" | 16 | SRC_URI[sha256sum] = "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46" |
@@ -26,4 +27,4 @@ PACKAGES += "${PN}-ids" | |||
26 | FILES_${PN}-dev += "${datadir}/pkgconfig" | 27 | FILES_${PN}-dev += "${datadir}/pkgconfig" |
27 | FILES_${PN}-ids = "${datadir}/usb*" | 28 | FILES_${PN}-ids = "${datadir}/usb*" |
28 | 29 | ||
29 | RDEPENDS_${PN} = "${PN}-ids bash" | 30 | RDEPENDS_${PN} = "${PN}-ids" |