Merge lp:~milo/linaro-image-tools/hwpack-args into lp:linaro-image-tools/11.11

[Milo Casagrande]

Added command line option for Android hwpack.

The proposed branch adds support for the new l-a-m-c command line option to pass and Android hwpack.
A small refactoring has been done: the debug option has been moved as a common option to all the args parser.

[lp:~milo/linaro-image-tools/hwpack-args]

594. By Milo Casagrande on 2012-12-07

Merged android-boards into hwpack-args.

595. By Milo Casagrande on 2012-12-10

Merged android-boards into hwpack-args.

596. By Milo Casagrande on 2012-12-10

Merged android-boards into hwpack-args.

597. By Milo Casagrande on 2012-12-11

Merged android-boards into hwpack-args.

598. By Milo Casagrande on 2012-12-27

Merged android-boards into hwpack-args.

599. By Milo Casagrande on 2012-12-27

Merged android-boards into hwpack-args.

600. By Milo Casagrande on 2012-12-27

Merged android-boards into hwpack-args.

[Данило Шеган (danilo)]

Revert the atexit.register change (as discussed), and good to go.

review: Approve

[lp:~milo/linaro-image-tools/hwpack-args]

601. By Milo Casagrande on 2012-12-28

Reverted atexit call.

=== modified file 'linaro-android-media-create'
--- linaro-android-media-create	2012-12-28 16:00:31 +0000
+++ linaro-android-media-create	2012-12-28 16:00:32 +0000
@@ -41,6 +41,7 @@
     )
 from linaro_image_tools.media_create import get_android_args_parser
 from linaro_image_tools.utils import (
+    additional_android_option_checks,
     ensure_command,
     get_logger
     )
@@ -93,6 +94,8 @@
 
     logger = get_logger(debug=args.debug)
 
+    additional_android_option_checks(args)
+
     # If --help was specified this won't execute.
     # Create temp dir and initialize rest of path vars.
     TMP_DIR = tempfile.mkdtemp()
@@ -107,6 +110,11 @@
     SDCARD_DISK = os.path.join(TMP_DIR, 'sdcard-disc')
 
     board_config = get_board_config(args.dev)
+    if args.hwpack:
+        board_config.from_file(args.hwpack)
+    else:
+        logger.warning("No Android hwpack provided: default board values "
+                       "will be used.")
     board_config.add_boot_args(args.extra_boot_args)
     board_config.add_boot_args_from_file(args.extra_boot_args_file)
 

=== modified file 'linaro_image_tools/media_create/__init__.py'
--- linaro_image_tools/media_create/__init__.py	2012-10-22 06:57:20 +0000
+++ linaro_image_tools/media_create/__init__.py	2012-12-28 16:00:32 +0000
@@ -78,6 +78,7 @@
     parser.add_argument(
         '--extra-boot-args-file', dest='extra_boot_args_file',
         required=False, help=('File containing extra boot arguments.'))
+    parser.add_argument("--debug", action="store_true")
 
 
 def get_args_parser():
@@ -173,7 +174,6 @@
         help="Select a bootloader from a hardware pack that contains more "
              "than one. If not specified, it will default to '%s'." %
              DEFAULT_BOOTLOADER)
-    parser.add_argument("--debug", action="store_true")
 
     add_common_options(parser)
     return parser
@@ -189,6 +189,9 @@
         '--image-file', '--image_file', dest='device',
         help='File where we should write the image file.')
     parser.add_argument(
+        '--hwpack', required=False,
+        help=('An Android hardware pack file with the board configuration.'))
+    parser.add_argument(
         '--image-size', '--image_size', default='2G',
         help=('The image size, specified in mega/giga bytes (e.g. 3000M or '
               '3G); use with --image_file only'))
@@ -202,7 +205,6 @@
         '--console', action='append', dest='consoles', default=[],
         help=('Add a console to kernel boot parameter; this parameter can be '
               'defined multiple times.'))
-
     parser.add_argument(
         '--system', default='system.tar.bz2', required=True,
         help=('The tarball containing the Android system paritition'))
@@ -212,7 +214,6 @@
     parser.add_argument(
         '--boot', default='boot.tar.bz2', required=True,
         help=('The tarball containing the Android root partition'))
-
     parser.add_argument(
         '--no-part', dest='should_create_partitions', action='store_false',
         help='Reuse existing partitions on the given media.')

=== modified file 'linaro_image_tools/utils.py'
--- linaro_image_tools/utils.py	2012-10-22 06:57:20 +0000
+++ linaro_image_tools/utils.py	2012-12-28 16:00:32 +0000
@@ -346,6 +346,14 @@
                 "--hwpack argument (%s) is not a regular file" % hwpack)
 
 
+def additional_android_option_checks(args):
+    """Checks that some of the args passed to l-a-m-c are valid."""
+    if args.hwpack:
+        if not os.path.isfile(args.hwpack):
+            raise InvalidHwpackFile(
+                "--hwpack argument (%s) is not a regular file" % args.hwpack)
+
+
 def check_required_args(args):
     """Check that the required args are passed."""
     if args.dev is None: