Merge lp:~le-chi-thu/lava-dispatcher/fix-android-boot-problem into lp:lava-dispatcher

[Le Chi Thu]

Fixed boot android image problem caused by changing of init.rc file.

Please help me deploy it on production after approved.

All Android builds for all boards will failed without this fix.

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2012-03-27 01:33:15 +0000
+++ doc/changes.rst	2012-03-31 09:49:19 +0000
@@ -1,6 +1,11 @@
 Version History
 ***************
 
+* Fixed boot android image problem caused by changing of init.rc file.
+
+Version 0.5.11
+==============
+
 .. _version_0_5_11:
 
 Version 0.5.11

=== modified file 'lava_dispatcher/client/master.py'
--- lava_dispatcher/client/master.py	2012-03-20 06:59:13 +0000
+++ lava_dispatcher/client/master.py	2012-03-31 09:49:19 +0000
@@ -116,10 +116,7 @@
 
     _recreate_uInitrd(session)
 
-    session.run('umount /mnt/lava/boot')
-
-def _recreate_uInitrd(session):
-    logging.debug("Recreate uInitrd")
+def _update_uInitrd_partitions(session, rc_filename):
     # Original android sdcard partition layout by l-a-m-c
     sys_part_org = session._client.device_option("sys_part_android_org")
     cache_part_org = session._client.device_option("cache_part_android_org")
@@ -128,6 +125,23 @@
     sys_part_lava = session._client.device_option("sys_part_android")
     data_part_lava = session._client.device_option("data_part_android")
 
+    session.run(
+        'sed -i "/mount ext4 \/dev\/block\/mmcblk0p%s/d" %s'
+        % (cache_part_org, rc_filename), failok=True)
+
+    session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" %s'
+        % (data_part_org, data_part_lava, rc_filename), failok=True)
+    session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" %s'
+        % (sys_part_org, sys_part_lava, rc_filename), failok=True)
+    # for snowball the mcvblk1 is used instead of mmcblk0.
+    session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" %s'
+        % (data_part_org, data_part_lava, rc_filename), failok=True)
+    session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" %s'
+        % (sys_part_org, sys_part_lava, rc_filename), failok=True)
+
+def _recreate_uInitrd(session):
+    logging.debug("Recreate uInitrd")
+
     session.run('mkdir -p ~/tmp/')
     session.run('mv /mnt/lava/boot/uInitrd ~/tmp')
     session.run('cd ~/tmp/')
@@ -136,26 +150,17 @@
     session.run('mv uInitrd.data ramdisk.cpio.gz')
     session.run(
         'gzip -d -f ramdisk.cpio.gz; cpio -i -F ramdisk.cpio')
-    session.run(
-        'sed -i "/mount ext4 \/dev\/block\/mmcblk0p%s/d" init.rc'
-        % cache_part_org)
-#    session.run(
-#        'sed -i "/mount ext4 \/dev\/block\/mmcblk0p%s/d" init.rc'
-#        % data_part_org)
-    session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" init.rc'
-        % (data_part_org, data_part_lava))
-    session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" init.rc'
-        % (sys_part_org, sys_part_lava))
-    # for snowball the mcvblk1 is used instead of mmcblk0.
-    session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" init.rc'
-        % (data_part_org, data_part_lava))
-    session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" init.rc'
-        % (sys_part_org, sys_part_lava))
-    # failok true for this?:
+
+    # The mount partitions have moved from init.rc to init.partitions.rc
+    # For backward compatible with early android build, we updatep both rc files
+    _update_uInitrd_partitions(session, 'init.rc')
+    _update_uInitrd_partitions(session, 'init.partitions.rc')
+
     session.run(
         'sed -i "/export PATH/a \ \ \ \ export PS1 root@linaro: " init.rc')
 
     session.run("cat init.rc")
+    session.run("cat init.partitions.rc", failok=True)
 
     session.run(
         'cpio -i -t -F ramdisk.cpio | cpio -o -H newc | \