From c5fe33d940abd2b256db0079f206dc7aa8b86a0d Mon Sep 17 00:00:00 2001 From: Elly Jones Date: Tue, 27 Jul 2010 10:40:10 -0400 Subject: [PATCH] Revert "Copy multiple qualified DBs to the image based on the board name." This commit breaks the build for x86-full-fast-generic at least. It causes a file to be copied to itself during the build archive step: http://build.chromium.org/buildbot/chromiumos/builders/x86%20generic%20full%20fast/builds/128/steps/archive_build/logs/stdio TEST=None BUG=None This reverts commit 1cf432968191d627bb6349bad21a614e96a91942. Signed-Off-By: Elly Jones Signed-Off-By: Nathan Williams Review URL: http://codereview.chromium.org/2808069 --- mod_for_factory_scripts/500copyQualDb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mod_for_factory_scripts/500copyQualDb b/mod_for_factory_scripts/500copyQualDb index cb89b3db71..9f48039191 100755 --- a/mod_for_factory_scripts/500copyQualDb +++ b/mod_for_factory_scripts/500copyQualDb @@ -5,16 +5,17 @@ # found in the LICENSE file. TEST_DIR="${ROOT_FS_DIR}/usr/local/autotest/site_tests/hardware_Components" +COMPONENTS_FILE="${TEST_DIR}/qualified_components" # If QUALDB not specified, use the one based on board name. if [ -z ${QUALDB} ]; then - QUALDB="${TEST_DIR}/qualified_components_${BOARD}*" + QUALDB="${TEST_DIR}/qualified_components_${BOARD}" fi if [ ! -z ${QUALDB} ] && [ -f ${QUALDB} ]; then # Copy the qualified component file to the image echo "Copying ${QUALDB} to the image." - cp -f ${QUALDB} ${TEST_DIR}/ + cp -f ${QUALDB} ${COMPONENTS_FILE} else echo "No qualified component file found at: ${QUALDB}" fi