From 0bb1016de129f3d3cb02b4ae67554ecdcd368df4 Mon Sep 17 00:00:00 2001
From: Qing He <qing.he@intel.com>
Date: Fri, 30 Jul 2010 13:18:49 +0800
Subject: usbutils: upgrade to version 0.86

from 0.72

changes:
  - package new usbutils.pc
  - move binaries into /usr/{bin,sbin} as default. udev uses only
    usb.ids instead of binaries
  - remove DEFAULT_PREFERENCE
  - symbolic link /usr/sbin/lsusb to /usr/bin, lsusb can be used by
    non-root, inspired by Debian
  - separate usb.ids to a new package usbutils-ids, for finer grained
    control, inspired by pciutils, also usbutils RDEPENDS on
    usbutils-ids
  - don't rm ${S}/libusb any more, since usbutils now doesn't bundle
    an included libusb

Signed-off-by: Qing He <qing.he@intel.com>
---
 meta/packages/usbutils/usbutils_0.72.bb | 21 ---------------------
 meta/packages/usbutils/usbutils_0.86.bb | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 meta/packages/usbutils/usbutils_0.72.bb
 create mode 100644 meta/packages/usbutils/usbutils_0.86.bb

(limited to 'meta/packages/usbutils')

diff --git a/meta/packages/usbutils/usbutils_0.72.bb b/meta/packages/usbutils/usbutils_0.72.bb
deleted file mode 100644
index 0dbd79999..000000000
--- a/meta/packages/usbutils/usbutils_0.72.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Host side USB console utilities."
-SECTION = "base"
-DEPENDS += "libusb"
-LICENSE = "GPL"
-PRIORITY = "optional"
-DEFAULT_PREFERENCE = "1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz"
-S = "${WORKDIR}/usbutils-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--program-prefix="
-sbindir = "/sbin"
-bindir = "/bin"
-
-FILES_${PN} += "${datadir}/usb*"
-
-do_configure_prepend() {
-	rm -rf ${S}/libusb
-}
diff --git a/meta/packages/usbutils/usbutils_0.86.bb b/meta/packages/usbutils/usbutils_0.86.bb
new file mode 100644
index 000000000..8e4a3da45
--- /dev/null
+++ b/meta/packages/usbutils/usbutils_0.86.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Host side USB console utilities."
+HOMEPAGE = "http://www.linux-usb.org"
+SECTION = "base"
+PRIORITY = "optional"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS = "libusb zlib"
+RDEPENDS_${PN} = "${PN}-ids"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz"
+
+inherit autotools
+
+do_install_append() {
+	ln -s ../sbin/lsusb ${D}${bindir}/lsusb
+}
+
+PACKAGES += "${PN}-ids"
+
+FILES_${PN} += "${datadir}/pkgconfig"
+FILES_${PN}-ids = "${datadir}/usb*"
-- 
cgit v1.2.3