aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Smith <msmith@cbnco.com>2010-11-11 08:36:38 -0500
committerMichael Smith <msmith@cbnco.com>2010-11-12 14:01:35 -0500
commit3a06d26504b14a1fda815827a2ec85e26c10a498 (patch)
tree3a1f2eec0da0d5159ac40e7e5cc050d15cccfc52
parent36a01ad197f4691d2641771a8fc51aa12d011b36 (diff)
downloadopenembedded-3a06d26504b14a1fda815827a2ec85e26c10a498.tar.gz
usbutils 0.86: delete usb.ids if gzipped version is installed
Also split update-usbids.sh to a separate package, and allow building when sbindir != /sbin. Signed-off-by: Michael Smith <msmith@cbnco.com>
-rw-r--r--recipes/usbutils/usbutils_0.86.bb17
1 files changed, 15 insertions, 2 deletions
diff --git a/recipes/usbutils/usbutils_0.86.bb b/recipes/usbutils/usbutils_0.86.bb
index 905ad53222..000fcca8d3 100644
--- a/recipes/usbutils/usbutils_0.86.bb
+++ b/recipes/usbutils/usbutils_0.86.bb
@@ -4,19 +4,32 @@ DEPENDS += "virtual/libusb0"
LICENSE = "GPLv2"
PRIORITY = "optional"
+PR = "r1"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz \
"
inherit autotools
EXTRA_OECONF = "--program-prefix="
-sbindir = "/sbin"
-bindir = "/bin"
+sbindir = "${base_sbindir}"
+bindir = "${base_bindir}"
+
+PACKAGES =+ "${PN}-update"
FILES_${PN} += "${datadir}/usb*"
+FILES_${PN}-update = "${sbindir}/update-usbids.sh"
do_configure_prepend() {
rm -rf ${S}/libusb
}
+do_install_append() {
+ # The 0.86 Makefile.am installs both usb.ids and usb.ids.gz.
+ if [ -f ${D}${datadir}/usb.ids.gz ]
+ then
+ rm -f ${D}${datadir}/usb.ids
+ fi
+}
+
SRC_URI[md5sum] = "34979f675d2bcb3e1b45012fa830a53f"
SRC_URI[sha256sum] = "b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4"