Merge pull request #117 from philips/use-lsb-coreos

chore(*): use COREOS lsb-release variables
This commit is contained in:
Brandon Philips 2013-07-25 10:23:21 -07:00
commit 6deddda025

View File

@ -28,58 +28,50 @@ set -e
ROOT_FS_DIR="$FLAGS_root"
[ -n "$ROOT_FS_DIR" ] || die "--root is required."
[ -d "$ROOT_FS_DIR" ] || die "Root FS does not exist? ($ROOT_FS_DIR)"
[ -n "${CHROMEOS_VERSION_STRING}" ] || die "chromeos_version.sh isn't sourced."
[ -n "${COREOS_VERSION_STRING}" ] || die "chromeos_version.sh isn't sourced."
CHROMEOS_VERSION_NAME="CoreOS"
CHROMEOS_VERSION_AUSERVER=\
${CHROMEOS_VERSION_AUSERVER:-"http://$(hostname --fqdn):8080/update"}
CHROMEOS_VERSION_DEVSERVER=\
${CHROMEOS_VERSION_DEVSERVER:-"http://$(hostname --fqdn):8080"}
COREOS_VERSION_NAME="CoreOS"
COREOS_VERSION_AUSERVER=\
${COREOS_VERSION_AUSERVER:-"http://$(hostname --fqdn):8080/update"}
COREOS_VERSION_DEVSERVER=\
${COREOS_VERSION_DEVSERVER:-"http://$(hostname --fqdn):8080"}
# Official builds must set COREOS_OFFICIAL=1.
if [ ${COREOS_OFFICIAL:-0} = 1 ]; then
# Official builds (i.e., buildbot)
CHROMEOS_VERSION_TRACK="dev-channel"
CHROMEOS_VERSION_NAME="CoreOS"
CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build) \
${CHROMEOS_VERSION_TRACK} $FLAGS_board test"
CHROMEOS_VERSION_AUSERVER="https://api.core-os.net/v1/update/"
CHROMEOS_VERSION_DEVSERVER=""
COREOS_VERSION_TRACK="dev-channel"
COREOS_VERSION_NAME="CoreOS"
COREOS_VERSION_DESCRIPTION="${COREOS_VERSION_STRING} (Official Build) \
${COREOS_VERSION_TRACK} $FLAGS_board test"
COREOS_VERSION_AUSERVER="https://api.core-os.net/v1/update/"
COREOS_VERSION_DEVSERVER=""
elif [ "$USER" = "chrome-bot" ]; then
# Continuous builder
CHROMEOS_VERSION_TRACK="buildbot-build"
CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Continuous Build \
COREOS_VERSION_TRACK="buildbot-build"
COREOS_VERSION_DESCRIPTION="${COREOS_VERSION_STRING} (Continuous Build \
- Builder: ${BUILDBOT_BUILD:-"N/A"}) $FLAGS_board"
else
# Developer hand-builds
CHROMEOS_VERSION_TRACK=${CHROMEOS_VERSION_TRACK:-"developer-build"}
CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build \
- $USER) ${CHROMEOS_VERSION_TRACK} $FLAGS_board"
COREOS_VERSION_TRACK=${COREOS_VERSION_TRACK:-"developer-build"}
COREOS_VERSION_DESCRIPTION="${COREOS_VERSION_STRING} (Developer Build \
- $USER) ${COREOS_VERSION_TRACK} $FLAGS_board"
fi
# Set google-specific version numbers:
# CHROMEOS_RELEASE_BOARD is the target board identifier.
# CHROMEOS_RELEASE_DESCRIPTION is the version displayed by Chrome; see
# Set version numbers:
# COREOS_RELEASE_BOARD is the target board identifier.
# COREOS_RELEASE_DESCRIPTION is the version displayed by Chrome; see
# chrome/browser/chromeos/chromeos_version_loader.cc.
# CHROMEOS_RELEASE_NAME is a human readable name for the build.
# CHROMEOS_RELEASE_TRACK and CHROMEOS_RELEASE_VERSION are used by the software
# COREOS_RELEASE_NAME is a human readable name for the build.
# COREOS_RELEASE_TRACK and COREOS_RELEASE_VERSION are used by the software
# update service.
# TODO(skrul): Remove GOOGLE_RELEASE once Chromium is updated to look at
# CHROMEOS_RELEASE_VERSION for UserAgent data.
# COREOS_RELEASE_VERSION for UserAgent data.
sudo_append "${ROOT_FS_DIR}/etc/lsb-release" <<EOF
COREOS_RELEASE_BOARD=$FLAGS_board
COREOS_RELEASE_DESCRIPTION=$CHROMEOS_VERSION_DESCRIPTION
COREOS_RELEASE_NAME=$CHROMEOS_VERSION_NAME
COREOS_RELEASE_TRACK=$CHROMEOS_VERSION_TRACK
COREOS_RELEASE_VERSION=$CHROMEOS_VERSION_STRING
COREOS_AUSERVER=$CHROMEOS_VERSION_AUSERVER
COREOS_DEVSERVER=$CHROMEOS_VERSION_DEVSERVER
CHROMEOS_RELEASE_BOARD=$FLAGS_board
CHROMEOS_RELEASE_DESCRIPTION=$CHROMEOS_VERSION_DESCRIPTION
CHROMEOS_RELEASE_NAME=$CHROMEOS_VERSION_NAME
CHROMEOS_RELEASE_TRACK=$CHROMEOS_VERSION_TRACK
CHROMEOS_RELEASE_VERSION=$CHROMEOS_VERSION_STRING
GOOGLE_RELEASE=$CHROMEOS_VERSION_STRING
CHROMEOS_AUSERVER=$CHROMEOS_VERSION_AUSERVER
CHROMEOS_DEVSERVER=$CHROMEOS_VERSION_DEVSERVER
COREOS_RELEASE_DESCRIPTION=$COREOS_VERSION_DESCRIPTION
COREOS_RELEASE_NAME=$COREOS_VERSION_NAME
COREOS_RELEASE_TRACK=$COREOS_VERSION_TRACK
COREOS_RELEASE_VERSION=$COREOS_VERSION_STRING
COREOS_AUSERVER=$COREOS_VERSION_AUSERVER
COREOS_DEVSERVER=$COREOS_VERSION_DEVSERVER
EOF