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

Merge branch 'master' of ssh://gitrw.chromium.org:9222/crosutils

Browse Source
This commit is contained in:
Scott Zawalski 2010-10-04 13:00:24 -07:00
commit e394d421fa
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/cbuildbot.py
View File

@ -263,6 +263,14 @@ def _WipeOldOutput(buildroot):
RunCommand(['rm', '-rf', 'src/build/images'], cwd=buildroot) RunCommand(['rm', '-rf', 'src/build/images'], cwd=buildroot)
def _EnableLocalAccount(buildroot):
cwd = os.path.join(buildroot, 'src', 'scripts')
# Set local account for test images.
RunCommand(['./enable_localaccount.sh',
'chronos'],
print_cmd=False, cwd=cwd)
def _BuildImage(buildroot): def _BuildImage(buildroot):
_WipeOldOutput(buildroot) _WipeOldOutput(buildroot)
@ -415,6 +423,7 @@ def main():
if buildconfig['uprev']: if buildconfig['uprev']:
_UprevPackages(buildroot, revisionfile, board=buildconfig['board']) _UprevPackages(buildroot, revisionfile, board=buildconfig['board'])
_EnableLocalAccount(buildroot)
_Build(buildroot) _Build(buildroot)
if buildconfig['unittests']: if buildconfig['unittests']:
_RunUnitTests(buildroot) _RunUnitTests(buildroot)

1
bin/cbuildbot_config.py
View File

@ -48,7 +48,6 @@ config['x86_pineview_bin'] = {
'important' : False, 'important' : False,
'hostname' : 'codf200.jail', 'hostname' : 'codf200.jail',
'unittests': True, 'unittests': True,
'smoke_bvt' : True,
} }
config['arm_tegra2_bin'] = { config['arm_tegra2_bin'] = {
'board' : 'tegra2', 'board' : 'tegra2',

2
enter_chroot.sh
View File

@ -272,7 +272,7 @@ setup_env
# hand-sync'd some subdirs and edited files in others. # hand-sync'd some subdirs and edited files in others.
# In that case, check against origin/HEAD and mark** revision. # In that case, check against origin/HEAD and mark** revision.
# Use git:8 chars of sha1 # Use git:8 chars of sha1
REVISION=$(git rev-parse --short=8 HEAD) REVISION=$(cd ${FLAGS_trunk}/src/scripts ; git rev-parse --short=8 HEAD)
CHROOT_PASSTHRU="CHROMEOS_REVISION=$REVISION BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_OFFICIAL" CHROOT_PASSTHRU="CHROMEOS_REVISION=$REVISION BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_OFFICIAL"
if [ -d "$HOME/.subversion" ]; then if [ -d "$HOME/.subversion" ]; then
# Bind mounting .subversion into chroot # Bind mounting .subversion into chroot

6
image_to_usb.sh
View File

@ -236,7 +236,11 @@ then
if [ ${FLAGS_install} -ne ${FLAGS_TRUE} ]; then if [ ${FLAGS_install} -ne ${FLAGS_TRUE} ]; then
echo "Copying ${SRC_IMAGE} to ${FLAGS_to}..." echo "Copying ${SRC_IMAGE} to ${FLAGS_to}..."
sudo dd if="${SRC_IMAGE}" of="${FLAGS_to}" bs=4M if type pv >/dev/null 2>&1; then
sudo pv -ptre "${SRC_IMAGE}" | sudo dd of="${FLAGS_to}" bs=4M oflag=sync
else
sudo dd if="${SRC_IMAGE}" of="${FLAGS_to}" bs=4M oflag=sync
fi
sync sync
else else
if [ ${INSIDE_CHROOT} -ne 1 ]; then if [ ${INSIDE_CHROOT} -ne 1 ]; then