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

Unified Diff: build_image

Issue 3009003: build_image: add temporary hack to fix syslinux building. (Closed) Base URL: ssh://git@chromiumos-git/crosutils.git
Patch Set: address sosa's style comment Created 10 years, 5 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 | no next file » | 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 6741859c4934b3ed6d5a6f1fa00721e66af23866..5cc36e1727c87afbd3df5a7470a6d20383a42206 100755
--- a/build_image
+++ b/build_image
@@ -351,6 +351,9 @@ make_image_bootable() {
bootloader_to="${OUTPUT_DIR}/arm.mbr"
fi
+ # Temporary hack to fix syslinux building:
+ sudo umount ${ESP_FS_DIR}
+
# Update partition 12 / legacy bootloaders and arm.
${SCRIPTS_DIR}/update_bootloaders.sh \
--arch=${ARCH} \
@@ -367,8 +370,11 @@ make_image_bootable() {
fi
trap - EXIT
+ # Temporary hack to fix syslinux building, comment out -e ${ESP_FS_DIR}
+ # ${SCRIPTS_DIR}/mount_gpt_image.sh -u -r "${ROOT_FS_DIR}" \
+ # -s "${STATEFUL_FS_DIR}" -e "${ESP_FS_DIR}"
${SCRIPTS_DIR}/mount_gpt_image.sh -u -r "${ROOT_FS_DIR}" \
- -s "${STATEFUL_FS_DIR}" -e "${ESP_FS_DIR}"
+ -s "${STATEFUL_FS_DIR}"
}
# Modifies an existing image to add development packages
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698