Merge lp:~mabac/linaro-image-tools/live-build-modify into lp:linaro-image-tools/11.11

[Mattias Backman]

Hi,

This branch adds a --modify-rootfs option to linaro-media-create which takes the path to a live-build script. If passed the script will be run after installing hwpacks to the rootfs but before populating the target partitions.

Thanks,

Mattias

[Loïc Minier (lool)]

Looks ok; is this still pending a merge?

review: Approve

[Mattias Backman (mabac)]

On Mon, Mar 5, 2012 at 3:17 PM, Loïc Minier <email address hidden> wrote:
> Review: Approve
>
> Looks ok; is this still pending a merge?

It depends on getting 'lb modify' implemented and I guess that won't
happen (soon). So we generalized this to having the pre/post install
hooks.

I suppose we can abandon this branch since using lb from the hooks
will be possible.

> --
> https://code.launchpad.net/~mabac/linaro-image-tools/live-build-modify/+merge/81287
> You are the owner of lp:~mabac/linaro-image-tools/live-build-modify.

[Loïc Minier (lool)]

ok

Unmerged revisions

457. By Mattias Backman on 2011-11-04

Add modify-rootfs option to l-m-c for running a live build modify script after installing hwpacks.

=== modified file 'linaro-media-create'
--- linaro-media-create	2011-10-19 12:19:33 +0000
+++ linaro-media-create	2011-11-04 15:07:41 +0000
@@ -38,7 +38,10 @@
     setup_partitions,
     get_uuid,
     )
-from linaro_image_tools.media_create.rootfs import populate_rootfs
+from linaro_image_tools.media_create.rootfs import (
+    populate_rootfs,
+    live_build_modify,
+)
 from linaro_image_tools.media_create.unpack_binary_tarball import (
     unpack_binary_tarball,
     )
@@ -89,6 +92,8 @@
         required_commands.append('mkfs.%s' % args.rootfs)
     else:
         raise AssertionError('Unsupported rootfs type %s' % args.rootfs)
+    if args.modify_rootfs is not None:
+        required_commands.append('lb')
     for command in required_commands:
         ensure_command(command)
 
@@ -160,6 +165,9 @@
     install_hwpacks(ROOTFS_DIR, TMP_DIR, lmc_dir, args.hwpack_force_yes,
                     verified_files, *hwpacks)
 
+    if args.modify_rootfs:
+        live_build_modify(ROOTFS_DIR, args.modify_rootfs)
+
     if args.rootfs == 'btrfs':
         install_packages(ROOTFS_DIR, TMP_DIR, "btrfs-tools")
 

=== modified file 'linaro_image_tools/media_create/__init__.py'
--- linaro_image_tools/media_create/__init__.py	2011-10-19 14:18:52 +0000
+++ linaro_image_tools/media_create/__init__.py	2011-11-04 15:07:41 +0000
@@ -79,6 +79,9 @@
         '--dev', required=True, dest='board', choices=KNOWN_BOARDS,
         help='Generate an SD card or image for the given board.')
     parser.add_argument(
+        '--modify-rootfs', required=False, dest='modify_rootfs', 
+        help='The path to a live build script for modifying the rootfs.')
+    parser.add_argument(
         '--rootfs', default='ext4', choices=['ext2', 'ext3', 'ext4', 'btrfs'],
         help='Type of filesystem to use for the rootfs')
     parser.add_argument(

=== modified file 'linaro_image_tools/media_create/rootfs.py'
--- linaro_image_tools/media_create/rootfs.py	2011-10-19 13:59:30 +0000
+++ linaro_image_tools/media_create/rootfs.py	2011-11-04 15:07:41 +0000
@@ -41,6 +41,10 @@
     raise ValueError('Unsupported rootfs type')
 
 
+def live_build_modify(content_dir, script):
+    cmd_runner.run(['lb', 'modify', script, content_dir], as_root=True)
+
+
 def populate_rootfs(content_dir, root_disk, partition, rootfs_type,
                     rootfs_uuid, should_create_swap, swap_size,
                     partition_offset, board_config=None):