diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 492: Fix the order of populate_raw_partition() arguments.

Message ID 20120221080312.20853.34594.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Mattias Backman Feb. 21, 2012, 8:03 a.m. UTC 
Merge authors:
  Mattias Backman (mabac)
Related merge proposals:
  https://code.launchpad.net/~mabac/linaro-image-tools/fix-raw-partition-arguments/+merge/93389
  proposed by: Mattias Backman (mabac)
  review: Approve - Guilherme Salgado (salgado)
------------------------------------------------------------
revno: 492 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Tue 2012-02-21 08:57:57 +0100
message:
  Fix the order of populate_raw_partition() arguments.
modified:
  linaro_image_tools/media_create/android_boards.py
  linaro_image_tools/media_create/boards.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2012-02-20 18:32:21 +0000
+++ linaro_image_tools/media_create/android_boards.py	2012-02-21 07:57:57 +0000
@@ -165,7 +165,7 @@ 
 
     @classmethod
     def populate_raw_partition(cls, media, boot_dir):
-        super(AndroidBoardConfig, cls).populate_raw_partition(boot_dir, media)
+        super(AndroidBoardConfig, cls).populate_raw_partition(media, boot_dir)
 
     @classmethod
     def install_boot_loader(cls, boot_partition, boot_device_or_file):

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2012-01-24 18:40:27 +0000
+++ linaro_image_tools/media_create/boards.py	2012-02-16 10:25:22 +0000
@@ -711,7 +711,7 @@ 
 
         if (cls.snowball_startup_files_config is not None and
             cls.board != 'snowball_sd'):
-            cls.populate_raw_partition(chroot_dir, boot_device_or_file)
+            cls.populate_raw_partition(boot_device_or_file, chroot_dir)
 
         if cls.env_dd:
             # Do we need to zero out the env before flashing it?
@@ -1070,10 +1070,10 @@ 
         make_uImage(cls.load_addr, k_img_data, boot_dir)
         boot_script_path = os.path.join(boot_dir, cls.boot_script)
         make_boot_script(boot_env, boot_script_path)
-        cls.populate_raw_partition(chroot_dir, boot_device_or_file)
+        cls.populate_raw_partition(boot_device_or_file, chroot_dir)
 
     @classmethod
-    def populate_raw_partition(cls, chroot_dir, boot_device_or_file):
+    def populate_raw_partition(cls, boot_device_or_file, chroot_dir):
         # Populate created raw partition with TOC and startup files.
         config_files_path = os.path.join(chroot_dir, 'boot')
         _, toc_filename = tempfile.mkstemp()
@@ -1398,7 +1398,7 @@ 
         return uboot_file
 
     @classmethod
-    def populate_raw_partition(cls, chroot_dir, boot_device_or_file):
+    def populate_raw_partition(cls, boot_device_or_file, chroot_dir):
         # Zero the env so that the boot_script will get loaded
         _dd("/dev/zero", boot_device_or_file, count=cls.SAMSUNG_V310_ENV_LEN,
             seek=cls.SAMSUNG_V310_ENV_START)