svn commit: r389471 - in head/devel/android-tools-fastboot: . files

[Jan Beich]

Author: jbeich
Date: Sat Jun 13 16:59:35 2015
New Revision: 389471
URL: https://svnweb.freebsd.org/changeset/ports/389471

Log:
  devel/android-tools-fastboot: fix "devices" output
  
  Catch up with the following upstream changes:
  
  https://android.googlesource.com/platform/system/core/+/b4add9b%5E!/
  https://android.googlesource.com/platform/system/core/+/13081c6%5E!/
  
  Before
  
    $ fastboot devices
    no permissions         fastboot
  
    $ fastboot devices -l
    no permissions         fastboot
  
  After
  
    $ fastboot devices
    ABCD1234               fastboot
  
    $ fastboot devices -l
    ABCD1234               fastboot ugen1.2

Modified:
  head/devel/android-tools-fastboot/Makefile   (contents, props changed)
  head/devel/android-tools-fastboot/files/usb_freebsd.c   (contents, props changed)

Modified: head/devel/android-tools-fastboot/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/Makefile	Sat Jun 13 16:50:55 2015	(r389470)
+++ head/devel/android-tools-fastboot/Makefile	Sat Jun 13 16:59:35 2015	(r389471)
@@ -3,7 +3,7 @@
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	android-
 DISTVERSION=	5.1.1_r4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp,manpage
 DISTFILES=	bash_completion.d/fastboot?id=2b8cfec:bashcomp \

Modified: head/devel/android-tools-fastboot/files/usb_freebsd.c
==============================================================================
--- head/devel/android-tools-fastboot/files/usb_freebsd.c	Sat Jun 13 16:50:55 2015	(r389470)
+++ head/devel/android-tools-fastboot/files/usb_freebsd.c	Sat Jun 13 16:59:35 2015	(r389471)
@@ -72,6 +72,10 @@ probe(struct usb_handle *h, ifc_match_fu
 	info.dev_class = ddesc.bDeviceClass;
 	info.dev_subclass = ddesc.bDeviceSubClass;
 	info.dev_protocol = ddesc.bDeviceProtocol;
+	info.writable = 1;
+
+	snprintf(info.device_path, sizeof(info.device_path), "ugen%d.%d",
+		 libusb_get_bus_number(h->dev), libusb_get_device_address(h->dev));
 
 	if (ddesc.iSerialNumber != 0) {
 		libusb_get_string_descriptor_ascii(h->handle, ddesc.iSerialNumber,