diff --git a/mod_for_test_scripts/400installFio b/mod_for_test_scripts/400installFio deleted file mode 100755 index dc365bf835..0000000000 --- a/mod_for_test_scripts/400installFio +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Install fio and libaio1 -dpkg --install /modify_build/libaio1_*.deb -dpkg --install /modify_build/fio_*.deb - diff --git a/mod_for_test_scripts/500installPatch b/mod_for_test_scripts/500installPatch deleted file mode 100755 index 0a53019cae..0000000000 --- a/mod_for_test_scripts/500installPatch +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Install patch. -dpkg --install /modify_build/patch_*.deb - diff --git a/mod_for_test_scripts/b100fio b/mod_for_test_scripts/b100fio deleted file mode 100644 index 1627aa3c28..0000000000 --- a/mod_for_test_scripts/b100fio +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# build fio -pushd "${GCLIENT_ROOT}/src/third_party/fio" -./make_pkg.sh -popd - -sudo cp "${DEFAULT_BUILD_ROOT}"/x86/local_packages/fio_*.deb \ - "${ROOT_FS_DIR}/modify_build/" - diff --git a/mod_for_test_scripts/b101libaio1 b/mod_for_test_scripts/b101libaio1 deleted file mode 100644 index ece2082d9e..0000000000 --- a/mod_for_test_scripts/b101libaio1 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -sudo cp "${DEFAULT_IMG_MIRROR#*://}"/pool/main/liba/libaio/libaio1_*.deb \ - "${ROOT_FS_DIR}/modify_build" - diff --git a/mod_for_test_scripts/b500patch b/mod_for_test_scripts/b500patch deleted file mode 100644 index fcac54ce30..0000000000 --- a/mod_for_test_scripts/b500patch +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -sudo cp "${DEFAULT_IMG_MIRROR#*://}"/pool/main/p/patch/patch_*.deb \ - "${ROOT_FS_DIR}/modify_build" - diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh index 2aa1dd81a0..00c0993fe8 100755 --- a/mod_image_for_test.sh +++ b/mod_image_for_test.sh @@ -65,13 +65,6 @@ 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" -for script in "${scripts_dir}"/b[0-9][0-9][0-9]*[!$~]; do - . ${script} -done - MOD_SCRIPTS_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts" sudo mkdir -p "${ROOT_FS_DIR}/modify_scripts" sudo mount --bind "${MOD_SCRIPTS_ROOT}" "${ROOT_FS_DIR}/modify_scripts" @@ -81,7 +74,6 @@ sudo chroot "${ROOT_FS_DIR}" "/modify_scripts/test_setup.sh" sudo umount "${ROOT_FS_DIR}/modify_scripts" sudo rmdir "${ROOT_FS_DIR}/modify_scripts" -sudo rm -rf "${ROOT_FS_DIR}/modify_build" cleanup trap - EXIT