Patchwork usbutils: avoid dependency on bash

login
register
mail settings
Submitter Paul Eggleton
Date July 26, 2012, 10:04 a.m.
Message ID <1343297075-29312-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/33119/
State New
Headers show

Comments

Paul Eggleton - July 26, 2012, 10:04 a.m.
By virtue of having #!/bin/bash, the usb-devices script declared that it
requires bash, however manual examinasion, 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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../usb-devices-avoid-dependency-on-bash.patch     |   30 ++++++++++++++++++++
 meta/recipes-bsp/usbutils/usbutils_0.91.bb         |    7 +++--
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
Koen Kooi - July 26, 2012, 10:24 a.m.
Op 26 jul. 2012, om 12:04 heeft Paul Eggleton het volgende geschreven:

> By virtue of having #!/bin/bash, the usb-devices script declared that it
> requires bash, however manual examinasion, 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.

Is the update-usbids ash/dash safe as well nowadays?
Paul Eggleton - July 26, 2012, 10:38 a.m.
On Thursday 26 July 2012 12:24:44 Koen Kooi wrote:
> Op 26 jul. 2012, om 12:04 heeft Paul Eggleton het volgende geschreven:
> > By virtue of having #!/bin/bash, the usb-devices script declared that it
> > requires bash, however manual examinasion, 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.
> 
> Is the update-usbids ash/dash safe as well nowadays?

Manual examination shows no bashisms, checkbashisms reports nothing, and it 
works fine with ash here.

Cheers,
Paul
Koen Kooi - July 26, 2012, 10:42 a.m.
Op 26 jul. 2012, om 12:38 heeft Paul Eggleton het volgende geschreven:

> On Thursday 26 July 2012 12:24:44 Koen Kooi wrote:
>> Op 26 jul. 2012, om 12:04 heeft Paul Eggleton het volgende geschreven:
>>> By virtue of having #!/bin/bash, the usb-devices script declared that it
>>> requires bash, however manual examinasion, 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.
>> 
>> Is the update-usbids ash/dash safe as well nowadays?
> 
> Manual examination shows no bashisms, checkbashisms reports nothing, and it 
> works fine with ash here.

Awesome! Thanks for checking!
Paul Eggleton - July 26, 2012, 10:46 a.m.
On Thursday 26 July 2012 12:42:47 Koen Kooi wrote:
> Op 26 jul. 2012, om 12:38 heeft Paul Eggleton het volgende geschreven:
> > On Thursday 26 July 2012 12:24:44 Koen Kooi wrote:
> >> Op 26 jul. 2012, om 12:04 heeft Paul Eggleton het volgende geschreven:
> >>> By virtue of having #!/bin/bash, the usb-devices script declared that it
> >>> requires bash, however manual examinasion, 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.
> >> 
> >> Is the update-usbids ash/dash safe as well nowadays?
> > 
> > Manual examination shows no bashisms, checkbashisms reports nothing, and
> > it
> > works fine with ash here.
> 
> Awesome! Thanks for checking!

Since I also made a spelling mistake in the original commit message let me 
make a v2 also noting that this has been checked as well.

Cheers,
Paul

Patch

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 0000000..e3872ad
--- /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 examinasion, 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 490b05a..04d1681 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"