From 50637eebb8a16a4c8fe564a70ce8cba872e09343 Mon Sep 17 00:00:00 2001 From: Chris Sosa Date: Fri, 19 Aug 2011 20:00:18 -0700 Subject: [PATCH] Revert "Add feature to extract kernel image from other recovery image for use in recovery." This reverts commit c99f52ab42a3204c0b7cee1ffbcbee77acf2d11c Change-Id: I21c8f759ab49fb947c856f64369a6595ffdbbb0a Reviewed-on: http://gerrit.chromium.org/gerrit/6373 Reviewed-by: Chris Sosa Tested-by: Chris Sosa --- mod_image_for_recovery.sh | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh index 1d7fcbef9c..a118a4bce0 100755 --- a/mod_image_for_recovery.sh +++ b/mod_image_for_recovery.sh @@ -19,8 +19,6 @@ DEFINE_integer statefulfs_sectors 4096 \ # Skips the build steps and just does the kernel swap. DEFINE_string kernel_image "" \ "Path to a pre-built recovery kernel" -DEFINE_string recovery_image_with_kernel "" \ - "Optional path to a recovery image with a pre-built kernel." DEFINE_string kernel_outfile "" \ "Filename and path to emit the kernel outfile to. \ If empty, emits to IMAGE_DIR." @@ -283,21 +281,6 @@ install_recovery_kernel() { return 0 } -# Extracts a kernel from an existing recovery image. -# $1 path to new kernel image. -# $2 path to recovery image. -extract_kernel_image() { - local kernel_path="$1" - local recovery_image="$2" - - local kern_a_offset=$(partoffset ${recovery_image} 2) - local kern_a_count=$(partsize ${recovery_image} 2) - - info "Extracing kernel image from $2" - dd if="$recovery_image" of="$kernel_path" bs=512 \ - skip=$kern_a_offset count=$kern_a_count -} - update_partition_table() { local src_img=$1 # source image local temp_state=$2 # stateful partition image @@ -430,11 +413,7 @@ FACTORY_ROOT="${BOARD_ROOT}/factory-root" USE="fbconsole initramfs" emerge_custom_kernel "$FACTORY_ROOT" || failboat "Cannot emerge custom kernel" -if [ -n "FLAGS_recovery_image_with_kernel" ]; then - RECOVERY_KERNEL_IMAGE="$(tempfile -p "extracted_kernel")" - extract_kernel_image "$RECOVERY_KERNEL_IMAGE" \ - "$FLAGS_recovery_image_with_kernel" -elif [ -z "$FLAGS_kernel_image" ]; then +if [ -z "$FLAGS_kernel_image" ]; then create_recovery_kernel_image echo "Recovery kernel created at $RECOVERY_KERNEL_IMAGE" else