merge of '7c68840f9e61bf1b24bfe84c80958a929056fec3'

     and '96b052b9c5046dbbfa151a054726f9e9b67d7e7e'

8 files changed, 32 insertions, 2 deletions

diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index ae1ec5fb9c..96fd84a6fd 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -79,5 +79,7 @@ SRCREV_pn-sphyrna ?= "${AUTOREV}"
 SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
 SRCREV_pn-xoo ?= "${AUTOREV}"
 SRCREV_pn-mplayer ?= "${AUTOREV}"
+SRCREV_pn-usbpath ?= "${AUTOREV}"
+SRCREV_pn-usbpath-native ?= "${AUTOREV}"
 
 SRCREV ?= "${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 0cba28de58..5c80cf0c20 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -63,4 +63,6 @@ SRCREV_pn-openocd-native ?= "${AUTOREV}"
 SRCREV_pn-uboot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+SRCREV_pn-usbpath ?= "${AUTOREV}"
+SRCREV_pn-usbpath-native ?= "${AUTOREV}"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8b97c14deb..e2f2d03c1f 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -101,4 +101,6 @@ SRCREV_pn-mplayer ?= "24587"
 SRCREV_pn-networkmanager ?= "2887"
 SRCREV_pn-networkmanager-applet ?= "200"
 SRCREV_pn-libw100 ?= "47"
+SRCREV_pn-usbpath ?= "3108"
+SRCREV_pn-usbpath-native ?= "3108"
 
diff --git a/packages/dfu-util/dfu-util-native_svn.bb b/packages/dfu-util/dfu-util-native_svn.bb
index 9bfe4bae2c..457094df9e 100644
--- a/packages/dfu-util/dfu-util-native_svn.bb
+++ b/packages/dfu-util/dfu-util-native_svn.bb
@@ -2,7 +2,7 @@ require dfu-util_${PV}.bb
 
 inherit native
 
-DEPENDS = "libusb-native"
+DEPENDS = "libusb-native usbpath-native"
 
 do_stage() {
 	install -d ${STAGING_BINDIR_NATIVE}
diff --git a/packages/dfu-util/dfu-util_svn.bb b/packages/dfu-util/dfu-util_svn.bb
index 9be5b92979..1f34a5bc24 100644
--- a/packages/dfu-util/dfu-util_svn.bb
+++ b/packages/dfu-util/dfu-util_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PV = "0.1+svnr${SRCREV}"
 PR = "r0"
 
-DEPENDS = "libusb"
+DEPENDS = "libusb usbpath"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=dfu-util;proto=http"
 S = "${WORKDIR}/dfu-util"
diff --git a/packages/usbpath/.mtn2git_empty b/packages/usbpath/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/usbpath/.mtn2git_empty
diff --git a/packages/usbpath/usbpath-native_svn.bb b/packages/usbpath/usbpath-native_svn.bb
new file mode 100644
index 0000000000..0cfafa2942
--- /dev/null
+++ b/packages/usbpath/usbpath-native_svn.bb
@@ -0,0 +1,7 @@
+require usbpath_svn.bb
+inherit native
+
+do_stage () {
+	autotools_stage_all
+}
+
diff --git a/packages/usbpath/usbpath_svn.bb b/packages/usbpath/usbpath_svn.bb
new file mode 100644
index 0000000000..95c02c94ef
--- /dev/null
+++ b/packages/usbpath/usbpath_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Convert the physical locations of a USB device to/from its number"
+AUTHOR = "Werner Almesberger <werner@openmoko.org>"
+SECTION = "console/utils"
+LICENSE = "GPL"
+
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;proto=http"
+
+S = "${WORKDIR}/usbpath"
+
+inherit autotools
+
+do_stage () {
+	autotools_stage_all
+}
+