Merge lp:~salgado/linaro-image-tools/bug-898550 into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Increase the size of the system partition for android images from 256MB to 512MB

[Mattias Backman (mabac)]

Looks good to me. Creating an image with the system.tar.bz2 that caused the problem works with this branch.

We should just let Zach come back with a boot test before merging. On iMX53 and perhaps another board just to be safe?

review: Approve

[Данило Шеган (danilo)]

Does it make sense to query for the system.tar.bz2 file size ahead of time? Well, unextracted system.tar at the very least, though that's might not be telling enough either because of all the file metadata and alignment filesystems keep compared to tar files, but we could at least warn when you get dangerously close. We could also align the partition size automatically up to the smallest multiple of say 32MB (or whatever makes sense).

Note that the above comments should not stop this urgent fix from landing.

[Guilherme Salgado (salgado)]

On Tue, 2011-12-06 at 08:58 +0000, Данило Шеган wrote:
> Does it make sense to query for the system.tar.bz2 file size ahead of time? Well, unextracted system.tar at the very least, though that's might not be telling enough either because of all the file metadata and alignment filesystems keep compared to tar files, but we could at least warn when you get dangerously close. We could also align the partition size automatically up to the smallest multiple of say 32MB (or whatever makes sense).

Sounds like bug 866043 to me

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2011-11-17 09:03:31 +0000
+++ linaro_image_tools/media_create/android_boards.py	2011-12-05 19:58:23 +0000
@@ -114,7 +114,7 @@
             partition_type = '0x0E'
 
         BOOT_MIN_SIZE_S = align_up(128 * 1024 * 1024, SECTOR_SIZE) / SECTOR_SIZE
-        SYSTEM_MIN_SIZE_S = align_up(256 * 1024 * 1024, SECTOR_SIZE) / SECTOR_SIZE
+        SYSTEM_MIN_SIZE_S = align_up(512 * 1024 * 1024, SECTOR_SIZE) / SECTOR_SIZE
         CACHE_MIN_SIZE_S = align_up(256 * 1024 * 1024, SECTOR_SIZE) / SECTOR_SIZE
         USERDATA_MIN_SIZE_S = align_up(512 * 1024 * 1024, SECTOR_SIZE) / SECTOR_SIZE
         SDCARD_MIN_SIZE_S = align_up(512 * 1024 * 1024, SECTOR_SIZE) / SECTOR_SIZE

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-11-23 12:49:03 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-12-05 19:58:23 +0000
@@ -1156,27 +1156,27 @@
 
     def test_panda_android(self):
         self.assertEqual(
-            '63,270272,0x0C,*\n270336,524288,L\n794624,524288,L\n' \
-                '1318912,-,E\n1318912,1048576,L\n2367488,,,-', 
-                android_boards.AndroidPandaConfig.get_sfdisk_cmd())
+            '63,270272,0x0C,*\n270336,1048576,L\n1318912,524288,L\n'
+            '1843200,-,E\n1843200,1048576,L\n2891776,,,-',
+            android_boards.AndroidPandaConfig.get_sfdisk_cmd())
 
     def test_origen_android(self):
         self.assertEqual(
-            '1,8191,0xDA\n8253,270274,0x0C,*\n278528,524288,L\n' \
-                '802816,-,E\n802816,524288,L\n1327104,1048576,L\n2375680,,,-',
-                android_boards.AndroidOrigenConfig.get_sfdisk_cmd())
+            '1,8191,0xDA\n8253,270274,0x0C,*\n278528,1048576,L\n'
+            '1327104,-,E\n1327104,524288,L\n1851392,1048576,L\n2899968,,,-',
+            android_boards.AndroidOrigenConfig.get_sfdisk_cmd())
 
     def test_snowball_emmc_android(self):
         self.assertEqual(
-            '256,7936,0xDA\n8192,262144,0x0C,*\n270336,524288,L\n' \
-                '794624,-,E\n794624,524288,L\n1318912,1048576,L\n2367488,,,-', 
-                android_boards.AndroidSnowballEmmcConfig.get_sfdisk_cmd())
+            '256,7936,0xDA\n8192,262144,0x0C,*\n270336,1048576,L\n'
+            '1318912,-,E\n1318912,524288,L\n1843200,1048576,L\n2891776,,,-',
+            android_boards.AndroidSnowballEmmcConfig.get_sfdisk_cmd())
 
     def test_vexpress_android(self):
         self.assertEqual(
-            '63,270272,0x0E,*\n270336,524288,L\n794624,524288,L\n' \
-                '1318912,-,E\n1318912,1048576,L\n2367488,,,-', 
-                android_boards.AndroidVexpressA9Config.get_sfdisk_cmd())
+            '63,270272,0x0E,*\n270336,1048576,L\n1318912,524288,L\n'
+            '1843200,-,E\n1843200,1048576,L\n2891776,,,-',
+            android_boards.AndroidVexpressA9Config.get_sfdisk_cmd())
 
 class TestGetSfdiskCmdV2(TestCase):