Merge lp:~sergiusens/touch-preview-images/phablet-build-scripts into lp:touch-preview-images/phablet-build-scripts

[Sergio Schvezov]

Moved the image installation to a script to be more versatile.
Allow storing home and network settings when flashing a new image.

This initial changeset makes it inline to not affect current build system configurations.

[Ricardo Salveti (rsalveti)]

8 +package_extract_file("ubuntu_deploy.sh", "/tmp/ubuntu_deploy.sh");
9 +set_perm(0, 0, 0777, "/tmp/ubuntu_deploy.sh");

Do we really have /tmp/ access at recovery? Never tested, downloading the tarball to test.

55 +cat > ${WORKDIR}/ubuntu_deploy.sh << 'EOF'
56 +#!/sbin/sh

Any reason for it not to be a separated script? If separated, also make sure to add a header with copyright and such.

61 +phablet_home_bak=/data/phablet_home
+network_settings_bak=/data/nm_connections

I'd prefer to use a common directory for backups, like /data/ubuntu_bak or similar, so we know where to find the files in case of a failure when flashing the image.

Rest looks fine, creating an image to test it.

review: Needs Information

[Sergio Schvezov (sergiusens)]

> 8 +package_extract_file("ubuntu_deploy.sh", "/tmp/ubuntu_deploy.sh");
> 9 +set_perm(0, 0, 0777, "/tmp/ubuntu_deploy.sh");

We do have access to this, look at the system zip and the backup tool.

> Do we really have /tmp/ access at recovery? Never tested, downloading the
> tarball to test.
>
> 55 +cat > ${WORKDIR}/ubuntu_deploy.sh << 'EOF'
> 56 +#!/sbin/sh
>
> Any reason for it not to be a separated script? If separated, also make sure
> to add a header with copyright and such.

As per the description, I didn't want to interfere with the build system and add yet another parameter.

> 61 +phablet_home_bak=/data/phablet_home
> +network_settings_bak=/data/nm_connections
>
> I'd prefer to use a common directory for backups, like /data/ubuntu_bak or
> similar, so we know where to find the files in case of a failure when flashing
> the image.

Will do this.

> Rest looks fine, creating an image to test it.

Great, works nice from what I tried :-)

[Ricardo Salveti (rsalveti)]

Good, thanks!

review: Approve

[lp:~sergiusens/touch-preview-images/phablet-build-scripts]

15. By Sergio Schvezov on 2013-05-14

Moved the image installation to a script to be more versatile. Allow storing home and network settings when flashing a new image.

This initial changeset makes it inline to not affect current build system configurations.

=== modified file 'META-INF/com/google/android/updater-script'
--- META-INF/com/google/android/updater-script	2013-05-10 16:37:41 +0000
+++ META-INF/com/google/android/updater-script	2013-05-13 22:04:23 +0000
@@ -10,38 +10,14 @@
 
 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("Extracting the ubuntu rootfs tarball...");
-delete_recursive("/data/ubuntu_tmp_extract");
-run_program("/sbin/mkdir", "/data/ubuntu_tmp_extract");
-run_program("/sbin/tar", "--numeric-owner", "-xzf", "/data/ubuntu-rootfs.tar.gz", "-C", "/data/ubuntu_tmp_extract");
-set_progress(0.600000);
-
-ui_print("Saving phablet home...");
-run_program("/sbin/mv", "/data/ubuntu/home/phablet", "/data/phablet_home");
-ui_print("Saving network settings...");
-run_program("/sbin/mv", "/data/ubuntu/etc/NetworkManager/system-connections", "/data/nm_connections");
-set_progress(0.700000);
-
-ui_print("Setting up the new ubuntu rootfs...");
-delete_recursive("/data/ubuntu");
-run_program("/sbin/mv", "/data/ubuntu_tmp_extract/binary", "/data/ubuntu");
+ui_print("Deploying Ubuntu Touch...");
+run_program("/tmp/ubuntu_deploy.sh");
 set_progress(0.800000);
 
-ui_print("Restoring phablet home...");
-delete_recursive("/data/ubuntu/home/phablet");
-run_program("/sbin/mv", "/data/phablet_home", "/data/ubuntu/home/phablet");
-ui_print("Restoring network settings...");
-delete_recursive("/data/ubuntu/etc/NetworkManager/system-connections");
-run_program("/sbin/mv", "/data/nm_connections", "/data/ubuntu/etc/NetworkManager/system-connections");
-set_progress(0.850000);
-
-ui_print("Cleaning up");
-delete("/data/ubuntu-rootfs.tar.gz");
-delete_recursive("/data/ubuntu_tmp_extract");
-set_progress(0.900000);
-
 unmount("/data");
 run_program("/sbin/sync");
 set_progress(1.000000);
 
=== modified file 'ubuntu_data'
--- ubuntu_data	2013-05-01 05:48:50 +0000
+++ ubuntu_data	2013-05-13 22:04:23 +0000
@@ -61,6 +61,62 @@
 cp -av ${ROOTFS} ${WORKDIR}
 IMAGE=$(basename $ROOTFS)
 sed -i "s/#UBUNTUROOTFS#/$IMAGE/" ${WORKDIR}/META-INF/com/google/android/updater-script
+cat > ${WORKDIR}/ubuntu_deploy.sh << 'EOF'
+#!/sbin/sh
+
+ubuntu=/data/ubuntu
+ubuntu_bak=/data/ubuntu_bak
+
+phablet_home=$ubuntu/home/phablet
+phablet_home_bak=$ubuntu_bak/home
+
+network_settings=$ubuntu/etc/NetworkManager/system-connections
+network_settings_bak=$ubuntu_bak/nm_connections
+
+tmp_extract=/data/ubuntu_tmp_extract
+
+backup() {
+    mkdir -p $ubuntu_bak    
+    if [ -d $2 ]; then
+        echo "Removing previous backout of $1"
+        rm -rf $2
+    fi
+    if [ -d $1 ]; then
+        echo "Backing up $1 to $2"
+        mv $1 $2
+    fi
+}
+
+restore() {
+    if [ -d $2 ]; then
+        echo "Restoring $1 from $2"
+        rm -rf $1
+        mv $2 $1
+    fi
+}
+
+deploy_ubuntu() {
+    echo "Deploying Ubuntu"
+    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
+    if [ -d $ubuntu ]; then
+        rm -rf $ubuntu
+    fi
+    mv $tmp_extract/binary $ubuntu
+    rm -rf $tmp_extract
+}
+
+backup $phablet_home $phablet_home_bak
+backup $network_settings $network_settings_bak
+deploy_ubuntu
+restore $phablet_home $phablet_home_bak
+restore $network_settings $network_settings_bak
+EOF
+
 
 # Create and publish the update zip file
 cd ${WORKDIR}