Commit Graph

28179 Commits

Author SHA1 Message Date
David James
fa98729856 parallel_emerge now uninstalls packages correctly when use flags change.
When I added the --force-remote-binary flag, I needed to find a way to
get emerge to install binary packages whose use flags were not fully up
to date. To do this, I removed the --newuse flag from the call to the
emerge depgraph calculation code. This seemed safe at the time because
parallel_emerge already checks the use flags of every package it
installs. Unfortunately, things are a little more complex. Sometimes,
emerge decides to install a different version of a package because of a
use flag change. To implement this, Portage needs to know about the
--newuse flag.

To fix this bug, I've updated parallel_emerge to force in the remote
binary packages using a less intrusive method, that only impacts the
package that is being forced. This method should have less side effects
and allow us to install packages correctly.

TEST=./setup_board --board=tegra2_dev-board --force &&
     ./parallel_emerge --board=tegra2_dev-board -uDNvg opengles &&
     ./parallel_emerge --board=tegra2_dev-board -puDNvg board-devices
     ./parallel_emerge --board=tegra2_dev-board -uDNvg chromeos
--force-remote-binary=chromeos-chrome
BUG=chromium-os:10423

Change-Id: I2057d2992abcb08f184cfaa6c099bd6eb8c21a99

Review URL: http://codereview.chromium.org/6033001
2010-12-18 07:18:33 -08:00
Daniel Erat
3a13f91195 scripts: Update factory mod diff for boot-complete job.
I'm changing the boot-complete init script to start on
login-prompt-visible instead of login-prompt-ready in
http://codereview.chromium.org/5868004/.

This also adds a missing description and fixes an outdated
email address.

BUG=chromium-os:10349
TEST=ran mod_image_for_test.sh with --factory and with --factory_install and checked that resulting image contained boot-complete.conf change

Review URL: http://codereview.chromium.org/5975002

Change-Id: I709bc2b4eaaccd222b31388633522c32514206ac
2010-12-17 16:36:02 -08:00
Chris Sosa
40fa0ded27 Fixes to get ctest up and running again.
We had a major issue because the latest dev channel release pre-dates the virtio change.  Because of this, ctest was connecting to update that channel using virtio (which is unsupported for that).  This change drops a file telling the vm lib to use e1000 as before.

Also, fixed stateful change logic.

Change-Id: I394a8cece71bdd0d55efa21ba5b6d24804432c6b

BUG=chromium-os:10434
TEST=Ran it with ctest and cros_au_test_harness on images with/without the file.

Review URL: http://codereview.chromium.org/5928005
2010-12-17 13:15:05 -08:00
Chris Sosa
d523d23f2e Remove explicit call to build Chrome.
Since the package.keywords change, it's already built as part of build_packages.
With this change we don't have to needlessly build chrome twice as part of the
pfq.

Change-Id: I8dae745496a5d6f6213663b034ffe8d279d4efd3

BUG=chromium-os:8693
TEST=Ran unittests

Review URL: http://codereview.chromium.org/5973003
2010-12-17 12:35:34 -08:00
David Rochberg
b4f6b3c6a1 Make restart_in_chroot_if_needed run against scripts that are symlinks
This reverts the main change of
84e72fab23

and undoes the breakage of scripts that are symlinks to
...chromeos/scripts..., but at the cost of re-breaking scripts under
scripts/bin.  The correct fix is a combination of removing all the
symlinks to ...chromeos/scripts... and a more robust way of finding
the chroot path of the executable.  But that will have to wait until
someone else does it next week or I return from vacation

TEST=Ran all of these outside chroot.  None seemed more broken than when run in the chroot.  /setup_board  --board=x86-generic, ./cros_workon list --all --board=x86-mario, ./start_devserver , ./build_image --help, ./build_packages --help, ./cros_upgrade_chroot --help, ./enter_chroot.sh , ./customize_rootfs --help, ./run_remote_tests.sh , ./verify_rootfs_chksum.sh , ./set_shared_user_password.sh
BUG=n0ne

Change-Id: Ic2b7484e53e6a977ed6ae675fe99e109b385020d

Review URL: http://codereview.chromium.org/5946003
2010-12-17 11:55:40 -05:00
Chris Sosa
e516dae950 Simplify and clearify push logic.
Change-Id: I5366fb930ca76f596f49d0312228aa5beeccbc31

BUG=chromium-os:8693
TEST=Ran it with and without dryrun and chrome uprev.

Review URL: http://codereview.chromium.org/5846005
2010-12-16 20:01:58 -08:00
Chris Sosa
78bc7d7415 Fix regression introduced by proxy port.
Change-Id: I42a6110d41e79bb0ad50817e2e76b06f7973f6c2

BUG=chromium-os:10434
TEST=Ran it with --test_prefix for delay payload test and it succeeded.

Review URL: http://codereview.chromium.org/5877007
2010-12-16 19:37:28 -08:00
Mandeep Singh Baines
ea621903e9 build_kernel_image: enable nmi watchdog
BUG=10425
TEST=Tested before and after.

Change-Id: Ic3e66805945f379a79562338b16845bb5dbd674f
Before: Machine hangs till power-cycle.
After: Machine reboots and we get a crash dump.

Review URL: http://codereview.chromium.org/5893005
2010-12-16 18:27:06 -08:00
Doug Anderson
9362fa85c7 Allow specifying environment variables w/ enter_chroot again.
Examples of how people might be using enter_chroot:

1. ./enter_chroot [chroot_flags]   VAR1=val1 VAR2=val2 -- cmd arg1 arg2
   Set env vars and run cmd w/ args
2. ./enter_chroot [chroot_flags]   VAR1=val1 VAR2=val2
   Set env vars and run shell
3. ./enter_chroot [chroot_flags]   -- cmd arg1 arg2
   Run cmd w/ args
4. ./enter_chroot [chroot_flags]   VAR1=val1 VAR2=val2 cmd arg1 arg2
   Like #1 _if_ args aren't flags (if they are, enter_chroot will claim them)
5. ./enter_chroot [chroot_flags]   cmd arg1 arg2
   Like #3 _if_ args aren't flags (if they are, enter_chroot will claim them)

I also updated the help to indicate that whole-command quoting is no longer
supported.  If you really need whole-command quoting (maybe you want in-
chroot redirection), you'll need to use sh -c like:
  ./enter_chroot.sh -- sh -c "echo \"Save me\" > /tmp/save.txt"

You should avoid single quotes in the command and arguments.  This isn't
a new limitation: it's shflags related.

Change-Id: I0452a8730ac9b8197834edc753b9eece69896135

BUG=chromium-os:7072
TEST=Tried a whole bunch of these commands.

Review URL: http://codereview.chromium.org/5840003
2010-12-16 14:44:12 -08:00
Scott Zawalski
4228f22c97 Change tegra2 binary builder to use board=tegra2_dev-board instead of tegra2.
This aligns the binary builder with the full builder.

BUG=NA
TEST=NA

Review URL: http://codereview.chromium.org/5839004
2010-12-16 13:44:32 -08:00
Scott Zawalski
46fa8be1b3 Change tegra2 binary builder to use tegra2_dev-board as its board
instead of just tegra2.
2010-12-16 13:32:37 -08:00
Scott Zawalski
f5202e2911 Merge branch 'master' of ssh://gitrw.chromium.org:9222/crosutils 2010-12-16 13:25:20 -08:00
Chris Sosa
f19dea58e9 Fix discovering of stable candidate with unstable ebuilds.
Also add some more information output when we detect that there
is nothing to do.

Change-Id: Ia3dcf0d3c276e10d3368d6bd508f3a0d72be79cd

BUG=chromium-os:8693
TEST=Ran it with all 3 paramaters and current overlay.

Review URL: http://codereview.chromium.org/5884004
2010-12-16 12:36:45 -08:00
Chris Sosa
7c3fdc13b0 Push prebuilts by default.
Change-Id: I0d03b037253f299e36c3621ff6e5970e9af2bb11

BUG=chromium-os:10375
TEST=NA

Review URL: http://codereview.chromium.org/5876002
2010-12-15 17:42:44 -08:00
Chris Sosa
d75d3b43c8 Undo all the manifest logic from cbuildbot.
We also print to /dev/stderr directly to avoid flushing issues which have been occassionally given us broken manifests printed out

Change-Id: I97819bbc31142432aa5ef926f99f2c4f90fd50ef

BUG=chromium-os:9714
TEST=Ran cbuildbot through sync

Review URL: http://codereview.chromium.org/5888003
2010-12-15 17:42:07 -08:00
Doug Anderson
9b0127c6f5 Fixed build failure w/ new sudo
Change-Id: I2760e33e1473ce04f7adeda39d0db5725eaa81ae

BUG=chromium-os:7072
TEST=Replaced ./build_packages with bash and ran command; valided env var set right.

Review URL: http://codereview.chromium.org/5930002
2010-12-15 16:51:49 -08:00
Doug Anderson
7361be58e0 Fixed image_to_live so that it will work with the new sudo
This change will not work properly unless the chroot sudo is
updated to handle escaping properly:
  http://codereview.chromium.org/5923001

...and the chroot sudo will break image_to_live unless this
change goes in.  Thus, the two changes are intertwined.

Change-Id: Ib1602ee47178fc5d32c286e9a914111c1140252b

BUG=chromium-os:7072
TEST=Valided that the dev server seemed to be getting proper args.

Review URL: http://codereview.chromium.org/5929001
2010-12-15 16:05:56 -08:00
Doug Anderson
ebe1baa4ba Fixed update_kernel.sh not to put an extra set of quotes w/ enter_chroot.
This change is in preparation for the new sudo, which corrects how
parameters are passed to subcommands.

Change-Id: I34d09d2716fbef137d02748a2934459a8a10d693

BUG=chromium-os:7072
TEST=Ran modified "update_kernel.sh" w/ old sudo and new sudo.

Review URL: http://codereview.chromium.org/5859002
2010-12-15 13:56:09 -08:00
hexxeh
72d0b08d92 Added option to set ChromeOS version name, track and AU/dev server URLs via environment variables
Change-Id: I80914aa49e74edf71914aa93f310104210581ffd

BUG=none
TEST=Ran a x86-generic build and tested from USB drive

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=4a0a239

Review URL: http://codereview.chromium.org/5760004
Patch from hexxeh <hexxeh@hexxeh.net>.
2010-12-15 13:17:37 -08:00
Daniel Kurtz
b38b3c81bc run_remote_tests.sh: pass multiple arguments to autoserv
Change-Id: I7f54a0e078d0c7eb70e0a614bbb991cd372dec60

BUG=chromium-os:9841
TEST=
## Test with these 2 scripts
./bin/cros_run_wifi_tests.sh --cell 3 MatFunc --args "test_pat=000*"
## --and--
./run_remote_tests.sh --remote=${DUT} --args="test_pat=000* config_file=wifi_testbed_chromelab server_addr=${SERVER} router_addr=${ROUTER}" MatFunc

Review URL: http://codereview.chromium.org/5821001
2010-12-15 10:31:11 -08:00
Yasuhiro Matsuda
27c473d6c7 Fix the path of chromeos_version.sh in archive_build.sh
Change-Id: I16fd83aef4cfc11245a95af66813f7689386949b

TBR=djmm
BUG=chromium-os:9714, chromium-os:10354
TEST=none

Review URL: http://codereview.chromium.org/5884001
2010-12-15 17:35:54 +09:00
Chris Sosa
cd2196d6c5 Add package.keywords logic to build version of chrome we specify.
Change-Id: I32c17e7353b420d7a895acffab4579c9b861095c

BUG=chromium-os:8693
TEST=Ran it with chrome_rev=tot, latest_release and stable_release

Review URL: http://codereview.chromium.org/5854001
2010-12-14 17:57:02 -08:00
David McMahon
48db5d2068 Moving chromeos_version.sh to chromiumos_overlay.
BUG=chromium-os:9714
TEST=

Review URL: http://codereview.chromium.org/5513009

Change-Id: Ib569fe59f4e14551b198568b24014208b5d65647
2010-12-14 16:19:24 -08:00
Don Garrett
fdefe8664b Fix cros_run_vm_update --proxy_port support
BUG=chromium-os:10318
TEST=Manual

Review URL: http://codereview.chromium.org/5801001

Change-Id: I26f0cad29e2b36b045883f0e153e8994e6b436cd
2010-12-14 11:09:19 -08:00
Raja Aluri
888e07c9c8 Adding missing test
Change-Id: I1bbb4b0b54632878bcebdf2fac9fcbe105e2d6cd

BUG=None
TEST=Ran build_image with empty directory.

Review URL: http://codereview.chromium.org/5781009
2010-12-14 10:36:34 -08:00
Chris Sosa
97432e7e9e Don't push manifests for chrome pfq.
Change-Id: I252616725936b2c471026d39d06c3fbb2fa1ed65

BUG=chromium-os:8693
TEST=Ran with chrome_rev=tot

Review URL: http://codereview.chromium.org/5744003
2010-12-13 16:20:51 -08:00
Thieu Le
171321f8ff Zero free space on rootfs so it's more compressible for auto-update
BUG=chromium-os:10228
TEST=Build image, install image to Mario, make sure image still boots

Change-Id: Idc3c2a929515d39cb06926611eff37960074889c

Review URL: http://codereview.chromium.org/5704004
2010-12-13 11:37:42 -08:00
Chris Sosa
d8a0a57c30 Add support to pushing unstable changes for the chrome pfq.
This specifically gets the pfq one step closer to being completely ready to rev.  We add --noprebuilts for the chrome pfq as its not ready to host prebuilts and instead we push unstable ebuilds.  Anush noticed an Anush today where we are revving even when we don't change, and I've addressed this also in this CL.

Specifically:

1)  Sort in cbuildbot long options by long format
2)  Add --noprebuilts so that the Chrome PFQ can use this for now.
3)  Fixed a unittest that had broken in a previous CL for cros_mark_chrome_as_stable.
4)  Add ability for chrome to only rev if something really has changed:

 -- This means, if the new ebuild either:
  -- doesn't have the exact same chrome_version
  -- or diff -Bu (actual diff) between last ebuild and new ebuild isn't the same (i.e. detecting a 9999 change or different CROS_SVN_COMMIT)

Change-Id: I9b289c2168d6868299573f5d7c7a676380ee497e

BUG=chromium-os:8693
TEST=Ran unittests (cbuildbot, cros_mark_*) and ran cbuildbot with new chrome pfq items.

Review URL: http://codereview.chromium.org/5783001
2010-12-13 11:27:26 -08:00
Chris Sosa
c663f209f7 Add ability to store the manifest in the manifest directory.
Change-Id: I1ac3ed12df00424ba5ba2d1c61fd6fe9716e13b9

BUG=chromium-os:9714
TEST=Ran new unittests as well as ran cbuildbot on local b/cbuild

Review URL: http://codereview.chromium.org/5689003
2010-12-13 11:11:35 -08:00
Trevor Bourget
8e6abb04c6 scripts: repair build_image nostatefuldev collision
Change-Id: Ib9fcc078d8e0223cd1b1376db91d8e71ae8359a6

BUG=cp file to itself fails in case of nostatefuldev
TEST=ran build_image with and without statefuldev

Review URL: http://codereview.chromium.org/4959001
Patch from Trevor Bourget <tbourget@codeaurora.org>.
2010-12-13 09:44:32 -07:00
Raja Aluri
230756fc83 Switching most of the logging to debug
Change-Id: I812305b173050e4539ce0f77fa5193e214d7dc2d

BUG=None
TEST=Ran the au_generator.py script inside chroot

Review URL: http://codereview.chromium.org/5686004
2010-12-10 15:16:17 -08:00
Raja Aluri
aeb1048742 Moving generating au-generator.zip file to build_image.
Change-Id: Id4ed6af96e0b621f4ad36966fad45c887b991373

BUG=None
TEST=Ran a fresh build_packages and build_image for x86-generic.

Review URL: http://codereview.chromium.org/5689004
2010-12-10 13:03:09 -08:00
Allen Martin
5b2f49deeb Support booting from non zero MMC device numbers
On ARM platform read kernel from device passed in from u-boot
instead of hardcoding it to 0

BUG=none
TEST=emerged on seaboard, booted from SD card and emmc

Change-Id: Ia4506ed9f85d94eb37a9ac57430e1490d106c403

Review URL: http://codereview.chromium.org/5612008
Patch from Allen Martin <amartin@nvidia.com>.
2010-12-09 16:35:39 -08:00
Don Garrett
8be02f96b6 Create a transparent proxy for test programs to use, with the
ability to filter or manipulate content as it's passed through.

Create two example tests using this utility that cause
updates to close early to test resumes, and to add delays
to make sure the update still completes correctly.

What other tests should be created for this?

BUG=chromium-os:8207
TEST=Run by hand

Review URL: http://codereview.chromium.org/5632002

Change-Id: Iefb8c8e223fb2ba6bad2c551f7c4403a0bec6ecf
2010-12-09 15:54:11 -08:00
Don Garrett
86965c9baf Save off --remote flag
Change-Id: I5621ff8ab81408ac3f7daed970a065641495c4eb

BUG=chromium-os:10179
TEST=none

Review URL: http://codereview.chromium.org/5676002
2010-12-09 15:47:38 -08:00
Chris Sosa
4a5d7d9858 Wait for child to exit after killing it.
Use general purpose wait in case your connecting to a vm
that you didn't start.

Change-Id: Ie67e2d3235882d372d04e4a44d0781ddfc8d4645

BUG=chromium-os:10121
TEST=Ran it, caused some crashes.  Still ran test after retries.

Review URL: http://codereview.chromium.org/5757001
2010-12-09 15:46:09 -08:00
David James
ab5c6917c6 Update cbuildbot.py to use emptytree option instead of deleting board.
This allows us to avoid deleting the board and still ensure our packages are
in sync with the full buildbot. This allows us to detect conflicts between
old and new packages.

BUG=chromium-os:10127
TEST=Run cbuildbot.py with emptytree feature forced to on and verify that
     build_packages rebuilds all packages. Also run unit tests.

Change-Id: I83e186937e28eef44285724697895a4583910b58

Review URL: http://codereview.chromium.org/5652007
2010-12-09 14:52:46 -08:00
Chris Sosa
53ac954a36 Add some desired options to the au test harness.
Adds verbose flag to print output while updates are running rather than on error.
Adds test_prefix to specify a prefix of tests you want to run
Flushes stderr more reliably for builders and debugging purposes
Dies when stateful_updates fail

Change-Id: I9e4289deec3688c52b92763eee9334a8868f948e

BUG=chromium-os:6910
TEST=Ran with test_prefix and verbose on and off

Review URL: http://codereview.chromium.org/5573007
2010-12-09 11:29:31 -08:00
David James
3146eaa74e Fix typo where host prebuilts aren't getting updated.
archive_build.sh has code to archive host prebuilts, but the code isn't working because of a typo in archive_build.sh.

The typo: $FLAGS_board is misspelled as $FLAGS_BOARD.

BUG=chromium-os:10148
TEST=Ran prebuilt.py with --sync-host option

Change-Id: I50129b1fdfb931b1c076a064b970d7d943f556ac

Review URL: http://codereview.chromium.org/5724001
2010-12-09 09:37:14 -08:00
Anush Elangovan
84e72fab23 Revert "Factored out the code to copy an image and modify it for test"
Reverting for now since preflight fails.

This reverts commit 4fc5227fac.

TBR=sjg

Change-Id: I0ada89c15d0f5ecc07cb15b22d4084a37fa4ddb8
2010-12-08 23:22:15 -08:00
Simon Glass
4fc5227fac Factored out the code to copy an image and modify it for test
into mod_image_for_test.sh rather than slightly different versions
of the same in image_to_usb.sh and image_to_vm.sh

Added a function to get a test image into common.sh

Added --inplace option to mod_image_for_test, which is the default,
and preserves the original behaviour. But using --noinplace it will
now do the copy for you.

Found that chromiumos_image.bin appears throughout the scripts, so added it and the test variant to common.sh

BUG=chromiumos-10126
TEST=run mod_image_for_test.sh with and without --noinplace
run image_to_usb.sh and image_to_vm.sh with both options
test on Seaboard that correct image is provided

Really we should have automated testing for these scripts

Change-Id: I5cfa91792c7fded35e7f4ca8f8f27c6b270817fb

Review URL: http://codereview.chromium.org/5271010
2010-12-08 14:22:11 -08:00
Scott Zawalski
78bd3bdff8 Merge branch 'master' of ssh://gitrw.chromium.org:9222/crosutils 2010-12-08 13:57:10 -08:00
Chris Sosa
b5ed3128ee Change config to use stable vs. sticky.
Change-Id: I0dda2cfb6e11cb69a6a1a6a4bae478cab78b8947

BUG=chromium-os:8693
TEST=Ran it with cros_mark_chrome with stable_release
TBR=Config change to get chrome builder up.
2010-12-07 17:40:34 -08:00
Eric Li
b2b446631b Remove extra double quotes while passing args into autoserv.
Change-Id: Iaee4c276b8f03546cc32b30849e424c84c729aef

BUG=9841
TEST=run with sam's test script.

cd chromeos/src/scripts
echo chromelab > .default_wifi_test_lab
sudo echo 172.22.18.5   chromelab >>/etc/hosts
bin/cros_run_wifi_tests.sh --cell=4 MatFunc

Review URL: http://codereview.chromium.org/5523005
2010-12-07 17:35:47 -08:00
Anush Elangovan
0de6de66db Enable virtio for tests
Change-Id: I1d0e546f6ea837928ba426e4690007ef2649f68e

BUG=10102
TEST=test KVM with -net virtio and ensure it boots and can copy files in etc

Review URL: http://codereview.chromium.org/5543006
2010-12-07 17:31:48 -08:00
Ken Mixter
2fb9892ced crosutils: Use upstream dump_syms parameters for supporting splitdebug
Change-Id: If4eba8779496c4fb0283865da48ba38941de9c08

BUG=9281
TEST=ran without obvious errors

Review URL: http://codereview.chromium.org/5308005
2010-12-07 15:10:25 -08:00
David James
0614c4a11c Switch from gsdview.appspot.com to commondatastorage.googleapis.com.
This server requires that unsafe characters are quoted in URLs, so we do that
here.

Change-Id: I6b7c430671b02a8da11777029b0fdb59a87dcae1

BUG=chromium-os:9902
TEST=Ran unit tests. Ran example buildbot run and diff'd new version and old
     version of Packages file.

Review URL: http://codereview.chromium.org/5542002
2010-12-07 13:39:16 -08:00
Don Garrett
e55c89ab44 Create the latest_download dir if it doesn't exist.
I started to use /tmp, but it doesn't exist both inside and outside of the chroot. Using a consistent name like this has the advantage that the files will be cached and not redownloaded every time. Well, except on the build servers that wipe the related directories between builds.

Change-Id: I58b42d9f1bd18cc4eb44043ed2436d4ffa482767

BUG=chromium-os:10012
TEST=

Review URL: http://codereview.chromium.org/5597004
2010-12-06 15:59:14 -08:00
David McMahon
c9f365d707 Created branch 0.9.130.B. Update CHROMEOS_VERSION_BRANCH=131 2010-12-06 15:19:53 -08:00
Anush Elangovan
dcd5b59d4a Disable chrome version check in vm_test since it is in a ebuild
Change-Id: I1a3f46cf37341255dbb01866cf68e5308bb36d83

BUG=10024
TEST=adhoc

Review URL: http://codereview.chromium.org/5603007
2010-12-04 17:21:38 -08:00