Merge lp:~vishalbhoj/linaro-image-tools/increase-system-partition-size into lp:linaro-image-tools/11.11

[vishal]

[Milo Casagrande (milo)]

Hi Vishal,

I'm fine with the change, just one question: why exactly 768? Doubling the previous value (512) would be too big?
Also, before we can merge, please update the tests: with this change at least 7 are failing.

Thanks.

review: Needs Fixing

[lp:~vishalbhoj/linaro-image-tools/increase-system-partition-size]

647. By vishal on 2013-11-29

Update the tests wrt to the latest changes in system partition size for Android

[vishal (vishalbhoj)]

Doubling the previous value is no an option because fitting all the partition in a 2 GB sdcard would be difficult. Currently I have cut 256 MB from sdcard partition and added it to sytem partition. Also fixed the tests in commit 647.

[Milo Casagrande (milo)]

Thanks Vishal, looks good now.

review: Approve

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2013-04-03 11:32:40 +0000
+++ linaro_image_tools/media_create/android_boards.py	2013-11-29 10:17:04 +0000
@@ -60,10 +60,10 @@
 logger = logging.getLogger(DEFAULT_LOGGER_NAME)
 
 BOOT_MIN_SIZE_S = align_up(128 * 1024 * 1024, SECTOR_SIZE) / SECTOR_SIZE
-SYSTEM_MIN_SIZE_S = align_up(512 * 1024 * 1024, SECTOR_SIZE) / SECTOR_SIZE
+SYSTEM_MIN_SIZE_S = align_up(768 * 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
+SDCARD_MIN_SIZE_S = align_up(256 * 1024 * 1024, SECTOR_SIZE) / SECTOR_SIZE
 LOADER_MIN_SIZE_S = align_up(1 * 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	2013-08-19 07:39:34 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2013-11-29 10:17:04 +0000
@@ -1904,44 +1904,44 @@
 
     def test_panda_android(self):
         self.assertEqual(
-            '63,270272,0x0C,*\n270336,1048576,L\n1318912,524288,L\n'
-            '1843200,-,E\n1843200,1048576,L\n2891776,,,-',
+            '63,270272,0x0C,*\n270336,1572864,L\n1843200,524288,L\n'
+            '2367488,-,E\n2367488,1048576,L\n3416064,,,-',
             android_boards.AndroidPandaConfig().get_sfdisk_cmd())
 
     def test_origen_android(self):
         self.assertEqual(
-            '1,8191,0xDA\n8253,270274,0x0C,*\n278528,1048576,L\n'
-            '1327104,-,E\n1327104,524288,L\n1851392,1048576,L\n2899968,,,-',
+            '1,8191,0xDA\n8253,270274,0x0C,*\n278528,1572864,L\n'
+            '1851392,-,E\n1851392,524288,L\n2375680,1048576,L\n3424256,,,-',
             android_boards.AndroidOrigenConfig().get_sfdisk_cmd())
 
     def test_origen_quad_android(self):
         self.assertEqual(
-            '1,8191,0xDA\n8253,270274,0x0C,*\n278528,1048576,L\n'
-            '1327104,-,E\n1327104,524288,L\n1851392,1048576,L\n2899968,,,-',
+            '1,8191,0xDA\n8253,270274,0x0C,*\n278528,1572864,L\n'
+            '1851392,-,E\n1851392,524288,L\n2375680,1048576,L\n3424256,,,-',
             android_boards.AndroidOrigenQuadConfig().get_sfdisk_cmd())
 
     def test_snowball_emmc_android(self):
         self.assertEqual(
-            '256,7936,0xDA\n8192,262144,0x0C,*\n270336,1048576,L\n'
-            '1318912,-,E\n1318912,524288,L\n1843200,1048576,L\n2891776,,,-',
+            '256,7936,0xDA\n8192,262144,0x0C,*\n270336,1572864,L\n'
+            '1843200,-,E\n1843200,524288,L\n2367488,1048576,L\n3416064,,,-',
             android_boards.AndroidSnowballEmmcConfig().get_sfdisk_cmd())
 
     def test_vexpress_android(self):
         self.assertEqual(
-            '63,270272,0x0E,*\n270336,1048576,L\n1318912,524288,L\n'
-            '1843200,-,E\n1843200,1048576,L\n2891776,,,-',
+            '63,270272,0x0E,*\n270336,1572864,L\n1843200,524288,L\n'
+            '2367488,-,E\n2367488,1048576,L\n3416064,,,-',
             android_boards.AndroidVexpressConfig().get_sfdisk_cmd())
 
     def test_mx5_android(self):
         self.assertEqual(
-            '1,8191,0xDA\n8192,262144,0x0C,*\n270336,1048576,L\n'
-            '1318912,-,E\n1318912,524288,L\n1843200,1048576,L\n2891776,,,-',
+            '1,8191,0xDA\n8192,262144,0x0C,*\n270336,1572864,L\n'
+            '1843200,-,E\n1843200,524288,L\n2367488,1048576,L\n3416064,,,-',
             android_boards.AndroidMx53LoCoConfig().get_sfdisk_cmd())
 
     def test_mx6_android(self):
         self.assertEqual(
-            '1,8191,0xDA\n8192,262144,0x0C,*\n270336,1048576,L\n'
-            '1318912,-,E\n1318912,524288,L\n1843200,1048576,L\n2891776,,,-',
+            '1,8191,0xDA\n8192,262144,0x0C,*\n270336,1572864,L\n'
+            '1843200,-,E\n1843200,524288,L\n2367488,1048576,L\n3416064,,,-',
             android_boards.AndroidMx6QSabreliteConfig().get_sfdisk_cmd())