From a586930227ae6ab8041c2cf174ff09d7c22f8ee8 Mon Sep 17 00:00:00 2001
From: Darin Petkov <petkov@chromium.org>
Date: Tue, 1 Mar 2011 17:15:59 -0800
Subject: [PATCH] Switch build_image to use cros_set_lsb_release directly.

Also remove obsolete customize_rootfs symlink.

BUG=chromium-os:4628
TEST=build_image

Change-Id: Id2af4b87585c3e127cffd02525cc0da5fb11bbfd

Review URL: http://codereview.chromium.org/6602062
---
 build_image      | 9 +++++----
 customize_rootfs | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 120000 customize_rootfs

diff --git a/build_image b/build_image
index c9c3d8a90a..2f9a7e1299 100755
--- a/build_image
+++ b/build_image
@@ -191,8 +191,10 @@ if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
   EMERGE_BOARD_CMD="${EMERGE_CMD} --board=${FLAGS_board}"
 fi
 
+OVERLAY_CHROMEOS_DIR="${SRC_ROOT}/third_party/chromiumos-overlay/chromeos/"
+
 # Determine build version.
-. ${SRC_ROOT}/third_party/chromiumos-overlay/chromeos/config/chromeos_version.sh
+. "${OVERLAY_CHROMEOS_DIR}/config/chromeos_version.sh"
 
 # Configure extra USE or packages for this type of build.
 EXTRA_PACKAGES=""
@@ -647,10 +649,9 @@ create_base_image() {
     --root="${ROOT_FS_DIR}" --root-deps=rdeps \
     --usepkgonly chromeos ${EXTRA_PACKAGES} ${EMERGE_JOBS}
 
-  # Perform any customizations on the root file system that are needed.
-  "${SCRIPTS_DIR}/customize_rootfs" \
+  # Set /etc/lsb-release on the image.
+  "${OVERLAY_CHROMEOS_DIR}/scripts/cros_set_lsb_release" \
     --root="${ROOT_FS_DIR}" \
-    --target="${ARCH}" \
     --board="${BOARD}"
 
   # Populates the root filesystem with legacy bootloader templates
diff --git a/customize_rootfs b/customize_rootfs
deleted file mode 120000
index f3d432d9d9..0000000000
--- a/customize_rootfs
+++ /dev/null
@@ -1 +0,0 @@
-../third_party/chromiumos-overlay/chromeos/scripts/customize_rootfs
\ No newline at end of file