Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Unified Diff: build_image

Issue 6602062: Switch build_image to use cros_set_lsb_release directly. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git@master
Patch Set: update comment Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | customize_rootfs » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_image
diff --git a/build_image b/build_image
index c9c3d8a90a3f2551a538579bce0e5d5919256d3a..2f9a7e129997bf4146368b998ecdf2f101820101 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
« no previous file with comments | « no previous file | customize_rootfs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698