From 15284039745347de9f1544708e872c563f2a01c0 Mon Sep 17 00:00:00 2001 From: "kmixter@google.com" Date: Mon, 7 Dec 2009 23:11:44 +0000 Subject: [PATCH 1/2] By default use the most recently built image when modifying an image for test. Review URL: http://codereview.chromium.org/462043 git-svn-id: svn://chrome-svn/chromeos/trunk@344 06c00378-0e64-4dae-be16-12b19f9950a1 --- mod_image_for_test.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh index 8827b2e481..2aa1dd81a0 100755 --- a/mod_image_for_test.sh +++ b/mod_image_for_test.sh @@ -10,7 +10,9 @@ # The path to common.sh should be relative to your script's location. . "$(dirname "$0")/common.sh" -DEFINE_string image "rootfs.image" \ +IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images" +DEFAULT_IMAGE="${IMAGES_DIR}/$(ls -t $IMAGES_DIR 2>&-| head -1)/rootfs.image" +DEFINE_string image "$DEFAULT_IMAGE" \ "Location of the rootfs raw image file" # Parse command line @@ -61,6 +63,8 @@ LOOP_DEV=`sudo losetup -f` sudo losetup "${LOOP_DEV}" "${FLAGS_image}" sudo mount "${LOOP_DEV}" "${ROOT_FS_DIR}" +echo "Modifying image ${FLAGS_image} for test..." + # Run build steps for modify for test sudo mkdir -p "${ROOT_FS_DIR}/modify_build" scripts_dir="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts" From 8bbf602bac13cd393135252f52891d6c68ebbd75 Mon Sep 17 00:00:00 2001 From: Will Drewry Date: Mon, 7 Dec 2009 15:50:16 -0800 Subject: [PATCH 2/2] Add build and package support to minijail Packaging: - Adds packaging for minijail - Adds support for building minijail in the chroot (libcap-dev) - Fixes libcap2 versioning to be compatible with libcap-dev in the repo - Build minijail as part of the platform packages Code: - Fixed an initialization check bug in minijail and unittests Review URL: http://codereview.chromium.org/465106 --- build_platform_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_platform_packages.sh b/build_platform_packages.sh index c5ab3ed46f..312d8fae00 100755 --- a/build_platform_packages.sh +++ b/build_platform_packages.sh @@ -29,7 +29,7 @@ PLATFORM_DIR="$SRC_ROOT/platform" PLATFORM_DIRS="acpi assets fake_hal init installer login_manager \ memento_softwareupdate pam_google window_manager \ cros chrome screenlocker cryptohome \ - monitor_reconfig" + monitor_reconfig minijail" THIRD_PARTY_DIR="$SRC_ROOT/third_party" THIRD_PARTY_PACKAGES="connman e2fsprogs/files gflags gtest \