mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-29 17:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move the setting of CHROMEOS_VERSION_DESCRIPTION which uses CHROMEOS_REVISION out of chromeos_version.sh where it may not be set when called from archive_build.sh. Set it the only place it's used, in customize_rootfs.sh.

Browse Source 
Review URL: http://chromereview.prom.corp.google.com/1187036

git-svn-id: svn://chrome-svn/chromeos/trunk@237 06c00378-0e64-4dae-be16-12b19f9950a1
This commit is contained in:
djmm@google.com 2009-11-13 21:04:21 +00:00
parent 4393d5501e
commit 6ba3393116
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chromeos_version.sh
View File

@ -73,8 +73,6 @@ then
export_version_string export_version_string
export CHROMEOS_VERSION_NAME="Chrome OS" export CHROMEOS_VERSION_NAME="Chrome OS"
export CHROMEOS_VERSION_TRACK="dev-channel" export CHROMEOS_VERSION_TRACK="dev-channel"
# CHROMEOS_REVISION must be set in the environment for official builds
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})"
export CHROMEOS_VERSION_AUSERVER="https://tools.google.com/service/update2" export CHROMEOS_VERSION_AUSERVER="https://tools.google.com/service/update2"
export CHROMEOS_VERSION_DEVSERVER="" export CHROMEOS_VERSION_DEVSERVER=""
else else
@ -83,7 +81,6 @@ else
export_version_string export_version_string
export CHROMEOS_VERSION_NAME="Chromium OS" export CHROMEOS_VERSION_NAME="Chromium OS"
export CHROMEOS_VERSION_TRACK="developer-build" export CHROMEOS_VERSION_TRACK="developer-build"
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build - $(date)-$USER)"
HOSTNAME=$(hostname) HOSTNAME=$(hostname)
export CHROMEOS_VERSION_AUSERVER="http://$HOSTNAME:8080/update" export CHROMEOS_VERSION_AUSERVER="http://$HOSTNAME:8080/update"
export CHROMEOS_VERSION_DEVSERVER="http://$HOSTNAME:8080" export CHROMEOS_VERSION_DEVSERVER="http://$HOSTNAME:8080"
@ -92,4 +89,3 @@ fi
# Print version info. # Print version info.
echo "ChromeOS version information:" echo "ChromeOS version information:"
env | grep "^CHROMEOS_VERSION" | sed 's/^/ /' env | grep "^CHROMEOS_VERSION" | sed 's/^/ /'

10
customize_rootfs.sh
View File

@ -37,6 +37,16 @@ else
PASSWORD="gone now" PASSWORD="gone now"
fi fi
# Set CHROMEOS_VERSION_DESCRIPTION here (uses vars set in chromeos_version.sh)
# Was removed from chromeos_version.sh which can also be run outside of chroot
# where CHROMEOS_REVISION is set
if [ ${CHROMEOS_OFFICIAL:-0} = 1 ]
then
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})"
else
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build - $(date)-$USER)"
fi
# Set google-specific version numbers: # Set google-specific version numbers:
# CHROMEOS_RELEASE_CODENAME is the codename of the release. # CHROMEOS_RELEASE_CODENAME is the codename of the release.
# CHROMEOS_RELEASE_DESCRIPTION is the version displayed by Chrome; see # CHROMEOS_RELEASE_DESCRIPTION is the version displayed by Chrome; see