← Back to branch summary

~doanac/linaro-image-tools/overo-video

« back to all changes in this revision

Viewing changes to linaro-media-create

Merge lp:~lool/linaro-image-tools/testsuite-when-installed; allows running
parts of the testsuite when installed system-wide.  Had to resolve a conflict
in linaro-media-create and patch an additional install_hwpacks() call site.

Show diffs side-by-side

added added

removed removed

Lines of Context:
linaro-media-create
121
121
    unpack_binary_tarball(args.binary, TMP_DIR)
122
122
 
123
123
    hwpacks = args.hwpacks
124
 
    install_hwpacks(ROOTFS_DIR, TMP_DIR, args.hwpack_force_yes, *hwpacks)
 
124
    lmc_dir = os.path.dirname(__file__)
 
125
    if lmc_dir == '':
 
126
        lmc_dir = None
 
127
    install_hwpacks(
 
128
        ROOTFS_DIR, TMP_DIR, lmc_dir, args.hwpack_force_yes, *hwpacks)
125
129
 
126
130
    boot_partition, root_partition = setup_partitions(
127
131
        board_config, media, args.image_size, args.boot_label, args.rfs_label,