Merge lp:~florian-will/touch-preview-images/phablet-build-scripts-extract-from-sdcard into lp:touch-preview-images/phablet-build-scripts

[Florian W.]

See the commit message for what this merge request does.

NB: I've used that modification for my Desire Z and it seems to work fine. However, I've only modified an existing (from cdimages.ubuntu.com) saucy armhf zip file to include the changes. I haven't actually tested if the build scripts as modified with this merge request yield a useable zip file because I don't use those scripts. So make sure the changes are sane before merging. After all, they might even contain syntax errors.. :-)

I also don't know if there are unwanted side-effects (like worse performance) for devices where the /data partition is big enough.

[Florian W. (florian-will)]

See https://lists.launchpad.net/ubuntu-phone/msg02699.html

This won't work on some (most?) devices, so is not a good solution for the problem. I've replied to that mailing list post, but somehow my mails appear to get lost.

review: Needs Fixing

[lp:~florian-will/touch-preview-images/phablet-build-scripts-extract-from-sdcard]

24. By Florian W. on 2013-07-04

Use /ext/sdcard or /sdcard only if /data is too small.

Unmerged revisions

24. By Florian W. on 2013-07-04

Use /ext/sdcard or /sdcard only if /data is too small.

23. By Florian W. on 2013-07-01

Extract ubuntu rootfs tarball from /sdcard instead of /data.
This works better for devices with small /data partitions.

=== modified file 'META-INF/com/google/android/updater-script'
--- META-INF/com/google/android/updater-script	2013-05-28 06:52:42 +0000
+++ META-INF/com/google/android/updater-script	2013-07-04 15:00:37 +0000
@@ -5,21 +5,33 @@
 show_progress(1.000000, 60);
 
 ui_print("Mounting system and userdata partitions...");
-run_program("/sbin/mount","/system");
-run_program("/sbin/mount","/data");
+if !is_mounted("/system") then run_program("/sbin/mount","/system"); endif;
+if !is_mounted("/data") then run_program("/sbin/mount","/data"); endif;
 set_progress(0.100000);
 
-ui_print("Copying the ubuntu rootfs tarball...");
-package_extract_file("#UBUNTUROOTFS#", "/data/ubuntu-rootfs.tar.gz");
-package_extract_file("ubuntu_deploy.sh", "/tmp/ubuntu_deploy.sh");
-set_perm(0, 0, 0777, "/tmp/ubuntu_deploy.sh");
-set_progress(0.300000);
-
-ui_print("Deploying Ubuntu Touch...");
-run_program("/tmp/ubuntu_deploy.sh");
-set_progress(0.800000);
-
-unmount("/data");
-unmount("/system");
-run_program("/sbin/sync");
-set_progress(1.000000);
+package_extract_file("find_extract_location.sh", "/tmp/find_extract_location.sh");
+set_perm(0, 0, 0777, "/tmp/find_extract_location.sh");
+run_program("/tmp/find_extract_location.sh");
+
+ifelse(getprop("ubuntu.rootfs.extract.location") != "failed",
+(
+    ui_print("Copying the ubuntu rootfs tarball to");
+    ui_print(getprop("ubuntu.rootfs.extract.location"));
+    package_extract_file("#UBUNTUROOTFS#", getprop("ubuntu.rootfs.extract.location"));
+    package_extract_file("ubuntu_deploy.sh", "/tmp/ubuntu_deploy.sh");
+    set_perm(0, 0, 0777, "/tmp/ubuntu_deploy.sh");
+    set_progress(0.300000);
+
+    ui_print("Deploying Ubuntu Touch...");
+    run_program("/tmp/ubuntu_deploy.sh");
+    set_progress(0.800000);
+
+    unmount("/data");
+    unmount("/system");
+    run_program("/sbin/sync");
+    set_progress(1.000000);
+),
+(
+    abort("No suitable temporary partition for file extraction found! Try wiping /data or make sure there's enough free space on your SD card.");
+));
+

=== modified file 'ubuntu_data'
--- ubuntu_data	2013-05-31 04:15:02 +0000
+++ ubuntu_data	2013-07-04 15:00:37 +0000
@@ -83,6 +83,7 @@
 network_settings_bak=$ubuntu_bak/nm_connections
 
 tmp_extract=/data/ubuntu_tmp_extract
+tarball_location=$(/system/bin/getprop ubuntu.rootfs.extract.location)
 
 backup() {
     mkdir -p $ubuntu_bak
@@ -111,13 +112,13 @@
 }
 
 deploy_ubuntu() {
-    echo "Deploying Ubuntu"
+    echo "Deploying Ubuntu from tarball $tarball_location"
     if [ -d $tmp_extract ]; then
         rm -rf $tmp_extract
     fi
     mkdir $tmp_extract
-    tar --numeric-owner -xzf /data/ubuntu-rootfs.tar.gz -C $tmp_extract
-    rm /data/ubuntu-rootfs.tar.gz
+    tar --numeric-owner -xzf $tarball_location -C $tmp_extract
+    rm $tarball_location
     if [ -d $ubuntu ]; then
         rm -rf $ubuntu
     fi
@@ -137,6 +138,69 @@
 restore $timezone $timezone_bak
 EOF
 
+cat > ${WORKDIR}/find_extract_location.sh << 'EOF'
+#!/sbin/sh
+
+# threshold for free space on /data in kib
+datafree_threshold=2097152
+
+# threshold for free space on sdcard in kib
+sdfree_threshold=512000
+
+
+# check if the given parameter $1 is
+#    * a mount point
+#    * has enough free space ($2 kib)
+# if so, mount the partition, set the "ubuntu.rootfs.extract.location" property
+# based on the partition path and return 0, otherwise do nothing and return 1.
+check_mount() {
+    echo "Checking $1.."
+    is_valid_storage=1 # assume this is not a valid storage
+
+    mountpoint -q $1
+    retcode=$?
+    if [ $retcode -eq 0 ]; then # we have found a valid mount point..
+
+        # see if this needs to be mounted first
+        if mount | grep "on $1 "; then
+            is_mounted=0 # is already mounted!
+        else
+            echo "Mounting $1.."
+            is_mounted=1 # not mounted yet!
+            mount $1
+        fi
+
+        # check free space on this partition
+        freesize=$(df -P | grep $1 | awk '{ print $4 }')
+        if [ -z $freesize ]; then freesize=0; fi
+
+        if [ $freesize -ge $2 ]; then
+            /system/bin/setprop ubuntu.rootfs.extract.location "$1/tmp-ubuntu-rootfs.tar.gz"
+            is_valid_storage=0 # success
+            echo "Using $1!"
+        else
+            echo "$1: Not enough free space, only $freesize / $2 KiB"
+        fi
+
+        # unmount if this was previously not mounted and is not valid storage
+        if [ $is_mounted -eq 1 ] && [ $is_valid_storage -eq 1 ]; then
+            echo "Unmounting $1.."
+            umount $1
+        fi
+    fi
+
+    return $is_valid_storage
+}
+
+# check possible locations (NB: mind the || at the end of each line)
+check_mount "/data" $datafree_threshold ||
+check_mount "/ext/sdcard" $sdfree_threshold ||
+check_mount "/sdcard" $sdfree_threshold ||
+/system/bin/setprop ubuntu.rootfs.extract.location "failed"
+
+sync
+EOF
+
 
 # Create and publish the update zip file
 cd ${WORKDIR}