diff options
-rwxr-xr-x | linaro-hwpack-install | 10 | ||||
-rw-r--r-- | linaro_image_tools/media_create/boards.py | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/linaro-hwpack-install b/linaro-hwpack-install index a6e0e96..4a37d3f 100755 --- a/linaro-hwpack-install +++ b/linaro-hwpack-install @@ -274,6 +274,16 @@ extract_kernel_packages() { 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 diff --git a/linaro_image_tools/media_create/boards.py b/linaro_image_tools/media_create/boards.py index 02b291d..4e91954 100644 --- a/linaro_image_tools/media_create/boards.py +++ b/linaro_image_tools/media_create/boards.py @@ -1435,8 +1435,9 @@ class FastModelConfig(BoardConfig): 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 @@ def _get_file_matching(regex): 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) |