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

Unified Diff: build_image

Issue 3076009: Make oem_customization flag optional. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git
Patch Set: fix script 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 d97f75c88596639ab6722bc1d3e26b791881cd65..2a8dc2d75c78c6930ab885a6fc71845a13e61291 100755
--- a/build_image
+++ b/build_image
@@ -77,8 +77,7 @@ DEFINE_integer verity_max_ios 1024 \
DEFINE_string verity_algorithm "sha1" \
"Cryptographic hash algorithm used for kernel vboot. Default : sha1"
-DEFINE_string oem_customization \
- "$GCLIENT_ROOT/src/platform/assets/oem_customization" \
+DEFINE_string oem_customization "" \
"Path to directory containing OEM partner partition contents"
# Parse command line.
@@ -585,7 +584,7 @@ create_base_image() {
sudo mount "${OEM_LOOP_DEV}" "${OEM_FS_DIR}"
# Populate OEM partner partition.
- if [ -n ${FLAGS_oem_customization} ]; then
+ if [ ! -z "${FLAGS_oem_customization}" ]; then
if [ ! -d ${FLAGS_oem_customization} ]; then
echo "Specified OEM content directory does not exist. exiting."
exit 1
@@ -596,6 +595,8 @@ create_base_image() {
sudo find "${OEM_FS_DIR}" -type d -exec chmod 755 "{}" \;
sudo find "${OEM_FS_DIR}" -type f -exec chmod 644 "{}" \;
sudo chown -R root:root "${OEM_FS_DIR}"
+ else
+ echo "Empty OEM partition: OEM customizations will not be applied."
fi
# -- Install packages into the root file system --
« 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