mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 21:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Misc. fixes to versioning.

Browse Source
This commit is contained in:
David McMahon 2009-12-08 18:10:45 -08:00
parent 63adf95938
commit b059e344fc
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archive_build.sh
View File

@ -50,7 +50,11 @@ REVISION=${REVISION:0:8}
# Use the version number plus revision as the last change. (Need both, since # Use the version number plus revision as the last change. (Need both, since
# trunk builds multiple times with the same version string.) # trunk builds multiple times with the same version string.)
LAST_CHANGE="${CHROMEOS_VERSION_STRING}-r${REVISION}-b${FLAGS_build_number}" LAST_CHANGE="${CHROMEOS_VERSION_STRING}-r${REVISION}"
if [ -n "$FLAGS_build_number" ]
then
LAST_CHANGE="$LAST_CHANGE-b${FLAGS_build_number}"
fi
# The Chromium buildbot scripts only create a clickable link to the archive # The Chromium buildbot scripts only create a clickable link to the archive
# if an output line of the form "last change: XXX" exists # if an output line of the form "last change: XXX" exists

1
build_image.sh
View File

@ -208,6 +208,7 @@ MIRROR2_INSIDE="${FLAGS_mirror2/$GCLIENT_ROOT//trunk}"
# Write options for customize script into the chroot # Write options for customize script into the chroot
CUST_OPTS="${SETUP_DIR}/customize_opts.sh" CUST_OPTS="${SETUP_DIR}/customize_opts.sh"
cat <<EOF > $CUST_OPTS cat <<EOF > $CUST_OPTS
REAL_USER=$USER
SETUP_DIR="$ROOTFS_SETUP_DIR" SETUP_DIR="$ROOTFS_SETUP_DIR"
KERNEL_VERSION="$KERNEL_VERSION" KERNEL_VERSION="$KERNEL_VERSION"
SERVER="$MIRROR_INSIDE" SERVER="$MIRROR_INSIDE"

5
chromeos_version.sh
View File

@ -21,11 +21,6 @@ HOSTNAME=$(hostname)
export CHROMEOS_VERSION_MAJOR=0 export CHROMEOS_VERSION_MAJOR=0
export CHROMEOS_VERSION_MINOR=5 export CHROMEOS_VERSION_MINOR=5
# Major/minor versions.
# Primarily for product marketing.
export CHROMEOS_VERSION_MAJOR=0
export CHROMEOS_VERSION_MINOR=5
# Branch number. # Branch number.
# Increment by 1 in a new release branch. # Increment by 1 in a new release branch.
# Increment by 2 in trunk after making a release branch. # Increment by 2 in trunk after making a release branch.

4
customize_rootfs.sh
View File

@ -42,9 +42,11 @@ fi
# Set CHROMEOS_VERSION_DESCRIPTION here (uses vars set in chromeos_version.sh) # 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 # Was removed from chromeos_version.sh which can also be run outside of chroot
# where CHROMEOS_REVISION is set # where CHROMEOS_REVISION is set
# We have to set (in build_image.sh) and use REAL_USER due to many nested
# chroots which lose $USER state.
if [ ${CHROMEOS_OFFICIAL:-0} = 1 ]; then if [ ${CHROMEOS_OFFICIAL:-0} = 1 ]; then
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})" export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})"
elif [ "$USER" = "chrome-bot" ] elif [ "$REAL_USER" = "chrome-bot" ]
then then
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Continuous Build ${CHROMEOS_REVISION:?} - Builder: ${BUILDBOT_BUILD:-"N/A"})" export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Continuous Build ${CHROMEOS_REVISION:?} - Builder: ${BUILDBOT_BUILD:-"N/A"})"
else else