diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 515: Implement hwpack v2 support for i386 boards. Fixes #997147. Patch contributed by Luis Araujo.

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

Commit Message

Данило Шеган May 14, 2012, 12:30 p.m. UTC 
Merge authors:
  Luis Araujo (luis-araujo)
Related merge proposals:
  https://code.launchpad.net/~luis-araujo/linaro-image-tools/hwpackv2-i386/+merge/103198
  proposed by: Luis Araujo (luis-araujo)
  review: Approve - Данило Шеган (danilo)
------------------------------------------------------------
revno: 515 [merge]
committer: Danilo Šegan <danilo@segan.org>
branch nick: trunk
timestamp: Mon 2012-05-14 14:26:09 +0200
message:
  Implement hwpack v2 support for i386 boards.  Fixes #997147.  Patch contributed by Luis Araujo.
modified:
  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/boards.py'
--- linaro_image_tools/media_create/boards.py	2012-04-19 01:12:10 +0000
+++ linaro_image_tools/media_create/boards.py	2012-04-24 00:14:34 +0000
@@ -1510,7 +1510,7 @@ 
     _live_serial_opts = 'serialtty=%s'
 
     # define kernel image
-    kernel_flavors = ['generic']
+    kernel_flavors = ['generic', 'pae']
 
     # define bootloader
     BOOTLOADER_CMD = 'grub-install'
@@ -1535,9 +1535,6 @@ 
     def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
-        # XXX: delete this method when hwpacks V1 can die
-        assert cls.hwpack_format == HardwarepackHandler.FORMAT_1
-
         # copy image and init into boot partition
         cmd_runner.run(['cp', k_img_data, boot_dir], as_root=True).wait()
         cmd_runner.run(['cp', i_img_data, boot_dir], as_root=True).wait()
@@ -1564,6 +1561,15 @@ 
         cmd_runner.run(['cp', tmpfile, os.path.join(boot_dir,
             cls.BOOTLOADER_CFG_FILE)], as_root=True).wait()
 
+    @classmethod
+    def _make_boot_files_v2(cls, boot_env, chroot_dir, boot_dir,
+                            boot_device_or_file, k_img_data, i_img_data,
+                            d_img_data):
+        # reuse hwpack v1 function
+        cls._make_boot_files(boot_env, chroot_dir, boot_dir,
+                             boot_device_or_file, k_img_data, i_img_data,
+                             d_img_data)
+
 
 board_configs = {
     'beagle': BeagleConfig,