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

Merge branch 'master' of ssh://chromiumos-git/chromeos

Browse Source
This commit is contained in:
David McMahon 2009-12-09 10:37:27 -08:00
commit 20c39616b0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chromeos_version.sh
View File

@ -26,7 +26,7 @@ export CHROMEOS_VERSION_MINOR=5
# Increment by 2 in trunk after making a release branch.
# Does not reset on a major/minor change (always increases).
# (Trunk is always odd; branches are always even).
export CHROMEOS_VERSION_BRANCH=23
export CHROMEOS_VERSION_BRANCH=25
# Patch number.
# Increment by 1 each release on a branch.

10
customize_rootfs.sh
View File

@ -45,13 +45,13 @@ fi
# 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
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})"
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})"
elif [ "$REAL_USER" = "chrome-bot" ]
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
# Use the $USER passthru via $CHROMEOS_RELEASE_CODENAME
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build ${CHROMEOS_REVISION:?} - $(date) - $CHROMEOS_RELEASE_CODENAME)"
# Use the $USER passthru via $CHROMEOS_RELEASE_CODENAME
export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build ${CHROMEOS_REVISION:?} - $(date) - $CHROMEOS_RELEASE_CODENAME)"
fi
# Set google-specific version numbers:
@ -115,7 +115,7 @@ done
# The udev daemon takes a long time to start up and settle so we defer it until
# after X11 has been started. In order to be able to mount the root file system
# and start X we pre-propulate some devices. These are copied into /dev by the
# and start X we pre-populate some devices. These are copied into /dev by the
# chromeos_startup script.
UDEV_DEVICES=/lib/udev/devices
mkdir "$UDEV_DEVICES"/dri