diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 641: Add support for the new ARM models

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

Commit Message

Fathi Boudra Sept. 19, 2013, 3:10 p.m. UTC 
Merge authors:
  Fathi Boudra (fboudra)
Related merge proposals:
  https://code.launchpad.net/~fboudra/linaro-image-tools/new-models/+merge/186556
  proposed by: Fathi Boudra (fboudra)
  review: Approve - Milo Casagrande (milo)
------------------------------------------------------------
revno: 641 [merge]
committer: Fathi Boudra <fathi.boudra@linaro.org>
branch nick: linaro-image-tools
timestamp: Thu 2013-09-19 18:09:20 +0300
message:
  Add support for the new ARM models
modified:
  linaro-hwpack-install
  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-hwpack-install'
--- linaro-hwpack-install	2013-08-19 07:39:34 +0000
+++ linaro-hwpack-install	2013-09-19 14:15:46 +0000
@@ -274,6 +274,16 @@ 
     dpkg-deb -x ${pkg} $ROOTFS_DIR
   done
 
+  ls ${HWPACK_DIR}/pkgs/*-pre-boot_*.deb | while read pkg; do
+    echo "Extracting package `basename $pkg`"
+    dpkg-deb -x ${pkg} $ROOTFS_DIR
+  done
+
+  ls ${HWPACK_DIR}/pkgs/uefi-image-*.deb | while read pkg; do
+    echo "Extracting package `basename $pkg`"
+    dpkg-deb -x ${pkg} $ROOTFS_DIR
+  done
+
   # manually generate modules.dep
   ls $ROOTFS_DIR/lib/modules | while read kernel; do
     depmod -b $ROOTFS_DIR ${kernel} || true

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2013-08-16 08:01:22 +0000
+++ linaro_image_tools/media_create/boards.py	2013-09-19 14:15:46 +0000
@@ -1435,8 +1435,9 @@ 
         bw_foundation = _get_file_matching("%s/boot/img-foundation.axf" %
                                            chroot_dir)
 
-        for filename in (bw_ve, bw_foundation, k_img_data,
-                         i_img_data, d_img_data):
+        files = [bw_ve, bw_foundation, k_img_data, i_img_data, d_img_data]
+        files.extend(glob.glob("%s/fvp/*.bin" % boot_dir))
+        for filename in files:
             if filename is not None:
                 copy_drop(filename, output_dir)
                 cmd_runner.run(["cp", "-v", filename, boot_dir],
@@ -1891,7 +1892,7 @@ 
     elif len(files) == 0:
         return None
     else:
-        # TODO: Could ask the user to chosse which file to use instead of
+        # TODO: Could ask the user to choose which file to use instead of
         # raising an exception.
         raise ValueError("Too many files matching '%s' found." % regex)