Merge lp:~cyphermox/phablet-tools/fastboot-flashing into lp:phablet-tools

[Mathieu Trudel-Lapierre]

Make phablet-flash allow flashing straight from the bootloader.

One should be able to simply reboot into the bootloader and run phablet-flash, and successfully detect the device product name and flash it with the correct image.

This slightly changes the behavior of "phablet-flash -b" to first reboot into the recovery image before pushing the image to be installed to userdata.

Make phablet-flash allow flashing straight from the bootloader.

One should be able to simply reboot into the bootloader and run phablet-flash, and successfully detect the device product name and flash it with the correct image.

This slightly changes the behavior of "phablet-flash -b" to first reboot into the recovery image before pushing the image to be installed to userdata.

At a minimum, this removes the requirement for an Android install to have developer settings and USB debugging enabled to be able to install the Ubuntu Touch image.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-i386-ci/35

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/41/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Can't we make this the default bootstrapping method?

review: Needs Information

[Sergio Schvezov (sergiusens)]

also, why is the following needed?
143 + time.sleep(10)

fastboot does a wait for device on its own

[Sergio Schvezov (sergiusens)]

ah, to list devices... shouldn't it be closer to where it is needed? And is 10 seconds a good number?

[Mathieu Trudel-Lapierre (cyphermox)]

Indeed it does, but this is in the recovery using adb.
On May 6, 2013 3:20 PM, "Sergio Schvezov" <email address hidden>
wrote:

> also, why is the following needed?
> 143 + time.sleep(10)
>
> fastboot does a wait for device on its own
> --
>
> https://code.launchpad.net/~mathieu-tl/phablet-tools/fastboot-flashing/+merge/162424
> You are the owner of lp:~mathieu-tl/phablet-tools/fastboot-flashing.
>

Unmerged revisions

87. By Mathieu Trudel-Lapierre on 2013-05-03

Add support for flashing from fastboot and recovery; make bootstrap reboot to recovery before pushing images.

=== modified file 'phablet-flash'
--- phablet-flash	2013-04-24 19:09:49 +0000
+++ phablet-flash	2013-05-03 17:27:25 +0000
@@ -22,6 +22,7 @@
 import requests
 import subprocess
 import tempfile
+import time
 from os import path
 from phabletutils.adb import AndroidBridge
 from phabletutils.downloads import DownloadManager
@@ -62,6 +63,11 @@
                                use fastboot and are unlocked.''',
                        action='store_true',
                       )
+    parser.add_argument('-f',
+			'--fastboot',
+                        help='Specifies that the device should be flashed via fastboot.',
+			action='store_true',
+                       )
     group.add_argument('-D',
                        '--download-only',
                        help='''Download image only, but do not flash device.
@@ -235,15 +241,30 @@
 
 
 @adb_errors
-def detect_device(adb, device=None):
+def detect_device(adb, device=None, in_fastboot=False):
     '''If no argument passed determine them from the connected device.'''
-    # Check CyanogenMod property
-    if not device:
-        device = adb.getprop('ro.cm.device').strip()
-    # Check Android property
-    if not device:
-        device = adb.getprop('ro.product.device').strip()
-    log.info('Device detected as %s' % device)
+
+    if in_fastboot:
+        devices = subprocess.check_output('sudo fastboot devices',
+                                          stderr=subprocess.STDOUT,
+                                          shell=True)
+        if devices == "":
+            print ("No device connected in fastboot mode.")
+            exit(1)
+
+        product_var = subprocess.check_output('sudo fastboot getvar product',
+                                              stderr=subprocess.STDOUT,
+                                              shell=True)
+        device = product_var.split('\n')[0].split(' ')[1]
+    else:
+        # Check CyanogenMod property
+        if not device:
+            device = adb.getprop('ro.cm.device').strip()
+        # Check Android property
+        if not device:
+            device = adb.getprop('ro.product.device').strip()
+        log.info('Device detected as %s' % device)
+
     # property may not exist or we may not map it yet
     if device not in settings.supported_devices:
         log.error('Unsupported device, autodetect fails device')
@@ -252,13 +273,14 @@
 
 
 @adb_errors
-def bootstrap(adb, files):
+def bootstrap(adb, files, in_fastboot):
     '''
     Deploys device file using fastboot and launches recovery for ubuntu
     deployment.
     '''
-    adb.reboot(bootloader=True)
-    log.warning('The device needs to be unlocked for the following to work')
+    if not in_fastboot:
+        adb.reboot(bootloader=True)
+        log.warning('The device needs to be unlocked for the following to work')
 
     recovery_file = ''
     for img in files.keys():
@@ -277,7 +299,6 @@
 
     log.info('Booting into recovery')
     subprocess.check_call('sudo fastboot boot %s' % recovery_file, shell=True)
-    log.info('Once completed the device should reboot into Ubuntu')
 
 
 def get_jenkins_build_id(uri):
@@ -303,14 +324,21 @@
 
 
 @adb_errors
-def validate_device(adb):
+def validate_device(adb, in_recovery):
     '''
     Validates if the image would be installable on the target
     '''
-    df = adb.shell('df').split('\n')
+    if in_recovery:
+        df = adb.shell('df -h').split('\n')
+    else:
+        df = adb.shell('df').split('\n')
     try:
-        free_data = map(str.split,
-                        filter(lambda s: s.startswith('/data '), df))[0][3]
+        if in_recovery:
+            free_data = map(str.split,
+                            filter(lambda s: s.endswith(' /data\r'), df))[0][2]
+        else:
+            free_data = map(str.split,
+                            filter(lambda s: s.startswith('/data '), df))[0][3]
     except IndexError:
         log.error('Cannot find /data mountpoint')
         exit(1)
@@ -353,7 +381,7 @@
         adb = AndroidBridge()
     # Initializes the adb server if it is not running
     adb.start()
-    device = detect_device(adb, args.device)
+    device = detect_device(adb, args.device, args.fastboot)
     if not args.series:
         series = getattr(settings, 'default_series', None)
     # Determine uri to download from
@@ -386,7 +414,7 @@
     ubuntu_img = string_format_img('ubuntu_file', series)
     device_img = string_format_img('device_file', series, device)
     download_list = [ubuntu_img]
-    if args.bootstrap:
+    if args.bootstrap or args.fastboot:
         for attr in ('device_file_img', 'recovery_file_img', 'boot_file_img'):
             download_list.append(string_format_img(attr, series, device))
     else:
@@ -403,13 +431,19 @@
         log.error('Error while downloading, ensure connection')
         exit(1)
     if not args.download_only:
-        if settings.validate_device:
-            validate_device(adb)
-        if args.bootstrap:
+        if args.bootstrap or args.fastboot:
+            bootstrap(adb, download_mgr.files, args.fastboot)
+            log.info('Please wait while restarting into recovery...')
+            time.sleep(10)
+            if settings.validate_device:
+                validate_device(adb, True)
             push_for_autodeploy(adb,
                 download_mgr.files.get(ubuntu_img))
-            bootstrap(adb, download_mgr.files)
+            adb.shell('/sbin/recovery')
+            log.info('Once completed the device should reboot into Ubuntu')
         else:
+            if settings.validate_device:
+                validate_device(adb, False)
             recovery_file = create_recovery_file(adb,
                 download_mgr.files[device_img],
                 download_mgr.files[ubuntu_img],)