diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 551: Add basic definition and property accessor for "copy_files" field.

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

Commit Message

Paul Sokolovsky Aug. 28, 2012, 10:48 a.m. UTC 
Merge authors:
  Paul Sokolovsky (pfalcon)
Related merge proposals:
  https://code.launchpad.net/~pfalcon/linaro-image-tools/copy_files_field/+merge/121540
  proposed by: Paul Sokolovsky (pfalcon)
  review: Approve - James Tunnicliffe (dooferlad)
  review: Approve - Milo Casagrande (milo)
------------------------------------------------------------
revno: 551 [merge]
committer: Paul Sokolovsky <paul.sokolovsky@linaro.org>
branch nick: trunk
timestamp: Tue 2012-08-28 13:44:33 +0300
message:
  Add basic definition and property accessor for "copy_files" field.
modified:
  linaro_image_tools/hwpack/config.py
  linaro_image_tools/hwpack/hwpack_fields.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/hwpack/config.py'
--- linaro_image_tools/hwpack/config.py	2012-07-31 10:36:49 +0000
+++ linaro_image_tools/hwpack/config.py	2012-08-28 06:02:43 +0000
@@ -39,6 +39,7 @@ 
     BOOTLOADERS_FIELD,
     BOOT_MIN_SIZE_FIELD,
     BOOT_SCRIPT_FIELD,
+    COPY_FILES_FIELD,
     DD_FIELD,
     DTB_ADDR_FIELD,
     DTB_FILE_FIELD,
@@ -307,6 +308,11 @@ 
         return self._get_bootloader_option(SPL_IN_BOOT_PART_FIELD)
 
     @property
+    def boot_copy_files(self):
+        """Extra files to copy to boot partition."""
+        return self._get_bootloader_option(COPY_FILES_FIELD)
+
+    @property
     def spl_dd(self):
         """If the spl binary should be dd:d to the boot partition
         this field specifies the offset. An int."""

=== modified file 'linaro_image_tools/hwpack/hwpack_fields.py'
--- linaro_image_tools/hwpack/hwpack_fields.py	2012-07-31 10:36:49 +0000
+++ linaro_image_tools/hwpack/hwpack_fields.py	2012-08-28 06:02:43 +0000
@@ -60,6 +60,7 @@ 
 VERSION_FIELD = 'version'
 
 # Bootloaders specific fields
+COPY_FILES_FIELD = 'copy_files'
 DD_FIELD = 'dd'
 ENV_DD_FIELD = 'env_dd'
 EXTRA_BOOT_OPTIONS_FIELD = 'extra_boot_options'
@@ -138,6 +139,7 @@ 
             PACKAGE_FIELD: None,
             FILE_FIELD: None,
             IN_BOOT_PART_FIELD: None,
+            COPY_FILES_FIELD: None,
             DD_FIELD: None,
             EXTRA_BOOT_OPTIONS_FIELD: None,
             SPL_PACKAGE_FIELD: None,