From 54a83b774c4ae4f84852d64e96258fba6e78c3ea Mon Sep 17 00:00:00 2001
From: Hung-Te Lin <hungte@chromium.org>
Date: Thu, 30 Jun 2011 12:00:55 +0800
Subject: [PATCH] mod_for_factory: remove 500populateQualDbs

The '500populateQualDbs' script is now deprecated by the new chromeos-hwid
ebuild package.

HWQual database are merged into images automatically, no more need for
post-processing.

QUALDB and --qualdb are also removed, with typo in comments fixed.

BUG=chrome-os-partner:4276
TEST=./build_image --factory

Change-Id: I76d9a72943567444e26200fccc6fe5dff95b2687
Reviewed-on: http://gerrit.chromium.org/gerrit/3431
Reviewed-by: Vince Laviano <vlaviano@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
---
 build_image                                |  6 ++---
 mod_for_factory_scripts/500populateQualDbs | 27 ----------------------
 mod_image_for_test.sh                      |  3 +--
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100755 mod_for_factory_scripts/500populateQualDbs

diff --git a/build_image b/build_image
index 237232fc77..7ecc67d220 100755
--- a/build_image
+++ b/build_image
@@ -68,11 +68,9 @@ DEFINE_boolean statefuldev ${FLAGS_TRUE} \
 DEFINE_string to "" \
   "The target image file or device"
 DEFINE_boolean test ${FLAGS_FALSE} \
-  "Modify the imnage for automated testing"
+  "Modify the image for automated testing"
 DEFINE_boolean factory ${FLAGS_FALSE} \
   "Modify the image for manufacturing testing"
-DEFINE_string qualdb "" \
-  "Location of qualified component file"
 DEFINE_boolean factory_install ${FLAGS_FALSE} \
   "Build a smaller image to overlay the factory install shim on; this argument \
 is also required in image_to_usb."
@@ -853,7 +851,7 @@ mod_image_for_test () {
     mod_factory_script="${SCRIPTS_DIR}/mod_for_factory_scripts/factory_setup.sh"
     # Run factory setup script to modify the image
     sudo -E GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
-      QUALDB="${FLAGS_qualdb}" BOARD="${FLAGS_board}" "${mod_factory_script}"
+            BOARD="${FLAGS_board}" "${mod_factory_script}"
   fi
 
   # Re-run ldconfig to fix /etc/ldconfig.so.cache.
diff --git a/mod_for_factory_scripts/500populateQualDbs b/mod_for_factory_scripts/500populateQualDbs
deleted file mode 100755
index 2d869413b3..0000000000
--- a/mod_for_factory_scripts/500populateQualDbs
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2010 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.
-
-TEST_DIR="${ROOT_FS_DIR}/usr/local/autotest/site_tests/hardware_Components"
-
-if [ -d "${TEST_DIR}" ]; then
-  pushd "${TEST_DIR}" >/dev/null
-
-  # Remove the DB directories belonging to other boards.
-  KEEPDB="data_${BOARD}"
-  ls -d data_* 2>/dev/null | grep -v "${KEEPDB}" | xargs rm -fr
-
-  if [ "${BOARD}" = "x86-agz" -o "${BOARD}" = "x86-mario" ]; then
-    # Ensure there is a DB directory in x86-agz or x86-mario.
-    if [ ! -d "${KEEPDB}" ]; then
-      echo "No component DB directory found at: ${KEEPDB}"
-    fi
-    # Remove the default DB since it is unnecessary.
-    DEFAULTDB="approved_components.default"
-    rm -f "${DEFAULTDB}"
-  fi
-
-  popd >/dev/null
-fi
diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh
index 65898d8d1b..fb0bc47790 100755
--- a/mod_image_for_test.sh
+++ b/mod_image_for_test.sh
@@ -57,7 +57,6 @@ DEFINE_boolean installmask $FLAGS_TRUE \
     "Use INSTALL_MASK to shrink the resulting image." m
 DEFINE_integer jobs -1 \
     "How many packages to build in parallel at maximum." j
-DEFINE_string qualdb "" "Location of qualified component file" d
 DEFINE_boolean yes $FLAGS_FALSE "Answer yes to all prompts" y
 DEFINE_string build_root "/build" \
     "The root location for board sysroots."
@@ -272,7 +271,7 @@ if [ $FLAGS_factory -eq $FLAGS_TRUE ]; then
   MOD_FACTORY_SCRIPT="$SCRIPTS_DIR/mod_for_factory_scripts/factory_setup.sh"
   # Run factory setup script to modify the image
   sudo GCLIENT_ROOT="$GCLIENT_ROOT" ROOT_FS_DIR="$ROOT_FS_DIR" \
-      QUALDB="$FLAGS_qualdb" BOARD=$FLAGS_board "$MOD_FACTORY_SCRIPT"
+       BOARD=$FLAGS_board "$MOD_FACTORY_SCRIPT"
 fi
 
 # Re-run ldconfig to fix /etc/ldconfig.so.cache.