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
This commit is contained in:
Darin Petkov 2011-03-01 17:15:59 -08:00
parent d39057d242
commit a586930227
2 changed files with 5 additions and 5 deletions

View File

@ -191,8 +191,10 @@ if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
EMERGE_BOARD_CMD="${EMERGE_CMD} --board=${FLAGS_board}" EMERGE_BOARD_CMD="${EMERGE_CMD} --board=${FLAGS_board}"
fi fi
OVERLAY_CHROMEOS_DIR="${SRC_ROOT}/third_party/chromiumos-overlay/chromeos/"
# Determine build version. # 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. # Configure extra USE or packages for this type of build.
EXTRA_PACKAGES="" EXTRA_PACKAGES=""
@ -647,10 +649,9 @@ create_base_image() {
--root="${ROOT_FS_DIR}" --root-deps=rdeps \ --root="${ROOT_FS_DIR}" --root-deps=rdeps \
--usepkgonly chromeos ${EXTRA_PACKAGES} ${EMERGE_JOBS} --usepkgonly chromeos ${EXTRA_PACKAGES} ${EMERGE_JOBS}
# Perform any customizations on the root file system that are needed. # Set /etc/lsb-release on the image.
"${SCRIPTS_DIR}/customize_rootfs" \ "${OVERLAY_CHROMEOS_DIR}/scripts/cros_set_lsb_release" \
--root="${ROOT_FS_DIR}" \ --root="${ROOT_FS_DIR}" \
--target="${ARCH}" \
--board="${BOARD}" --board="${BOARD}"
# Populates the root filesystem with legacy bootloader templates # Populates the root filesystem with legacy bootloader templates

View File

@ -1 +0,0 @@
../third_party/chromiumos-overlay/chromeos/scripts/customize_rootfs