Commit Graph

28179 Commits

Author SHA1 Message Date
David James
c9ca3dbb0e Revert gvfs hacks to known-good state.
Originally, I patched enter_chroot.sh to stop the gvfs daemons to work
around an issue where these daemons would prevent loop devices from being
unmounted. See https://bugzilla.gnome.org/show_bug.cgi?id=677648

Unfortunately, temporarily stopping gvfs daemons has a bad side effects:
other GUI applications that rely on these daemons responding start hanging.
This can be reproduced, for example, by starting 'gedit'.

To fix these hangs, I'm just reverting my patches to enter_chroot.sh and
restoring the scripts to where they were before.

This reverts the following patches:
  1. Stop gvfs daemons earlier during enter_chroot.
     This reverts commit 0079158f73.
  2. Revert "Stop the gvfsd-trash daemon during enter_chroot."
     This reverts commit 654a00bd61.
  3. Revert "Stop the automounting daemon whenever we're inside the chroot."
     This reverts commit fae0a59e8b.
  4. Revert "Clean up update_bootloaders.sh to avoid sleeping."
     This reverts commit 0103b59138.

BUG=chromium-os:23443
TEST=Trybot run.

Change-Id: Ie9ff222fe5fc7232fd1fc39af129cc18531118c6
Reviewed-on: https://gerrit.chromium.org/gerrit/26922
Reviewed-by: Chris Wolfe <cwolfe@chromium.org>
Reviewed-by: Jon Kliegman <kliegs@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
2012-07-09 14:42:10 -07:00
Kees Cook
224817fda9 Relocate stateful_parition/var to stateful_partition/var_overlay
To avoid needing to migrate fresh dev images's /var contents when
using the encrypted partition, move the /var bits out of the old
stateful_partition/var location into stateful_partition/var_overlay.

The (initially empty) system /var will continue to either live
in stateful_partition/var (in the unencrypted case), or in
stateful_partition/encrypted/var (in the encrypted case).

The contents needed for gmerge will be symlinked into place at runtime
(via CL I6e68b1f334f5d5b3c4d2977008435bd929191ce7). While the installer
already makes sure that /var is not shipped on an image, this change
additionally make sure that the other contents installed by the ebuilds
will not show up in the actual /var either.

BUG=chromium-os:22172
TEST=link build, boot, install, manual testing.

Change-Id: Ie6480a59929818fe5d36a46abf533b648fb78850
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/26355
Reviewed-by: Chris Sosa <sosa@chromium.org>
2012-07-09 09:06:30 -07:00
Sonny Rao
dedc2a19a8 Upgraded the cscope Portage package
Upgraded dev-util/cscope to version 15.7a-r1 on amd64

BUG=none
TEST="sudo emerge cscope" works on the host

Change-Id: Ib8d34c2cb2cd4101e00571893a7f544915677299
Reviewed-on: https://gerrit.chromium.org/gerrit/26811
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Sonny Rao <sonnyrao@chromium.org>
Tested-by: Sonny Rao <sonnyrao@chromium.org>
2012-07-05 16:41:53 -07:00
Tom Wai-Hong Tam
ccf8f9590d Revert "Run setup_test_links in both deps"
This reverts commit 0f9fad45831ee5a7dfcf2b1fef9f9bb4cf6f3465

I guess it caused the tree broken. There is a VMTest failure that can't find the pyauto_dep package file. Only this CL changed the pyauto_dep thing recently.

http://build.chromium.org/p/chromiumos/builders/amd64%20generic%20full/builds/3380

I can't ping the authors. So revert this CL first.

Change-Id: I3ace2951e3129e39ef76b534e1b68598a3c075d3
Reviewed-on: https://gerrit.chromium.org/gerrit/26651
Reviewed-by: Joseph Shyh-In Hwang <josephsih@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
2012-07-02 22:04:52 -07:00
Kris Rambish
e1b6bffcb6 Run setup_test_links in both deps
TEST=Ran it
BUG=None

Change-Id: I8aca7639ca3461c3f108e6faf60111ce4ed5b4af
Reviewed-on: https://gerrit.chromium.org/gerrit/26631
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Nirnimesh <nirnimesh@chromium.org>
2012-07-02 18:24:53 -07:00
Sonny Rao
d4feba845d Add mod for test script which sets the PAGER default correctly
This will set the PAGER to /usr/local/bin/less instead of /usr/bin/less

BUG=none
TEST=PAGER variable points to the correct place by default

Change-Id: I7becfe39ea1817fd17195d8eee46d23d4b8b0d00
Reviewed-on: https://gerrit.chromium.org/gerrit/26602
Reviewed-by: Anush Elangovan <anush@google.com>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Sonny Rao <sonnyrao@chromium.org>
Commit-Ready: Sonny Rao <sonnyrao@chromium.org>
2012-07-02 18:02:09 -07:00
David James
0079158f73 Stop gvfs daemons earlier during enter_chroot.
The killall commands for stopping gvfs weren't working
consistently for two reasons:
  1) They ran too late, after it already picked up the
     mounts in cros_sdk.
  2) killall sometimes can only access the first 15 characters
     of a process name, so we should only match on these characters.

BUG=chromium-os:23443
TEST=Verify gvfs is properly stopped when entering the chroot
     on precise systems.

Change-Id: I16aff4b0d9ac101083b63e06e55d50869479a152
Reviewed-on: https://gerrit.chromium.org/gerrit/26369
Reviewed-by: Pawel Osciak <posciak@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
2012-06-29 09:57:10 -07:00
Mike Frysinger
926a4b901c enter_chroot: make sure ccache dir perms are correct
For fresh sdk builds, gcc won't update and automatically see the
ccache tree for us.  So make sure the perms are sane when people
enter the chroot.  This will also automatically fix perms if/when
people manually delete the ccache dir (which sometimes happens on
the buildbots when people try to free up space).

BUG=None
TEST=`rm -rf distfiles/ccache/; cros_sdk` and see ccache dir get setup nicely

Change-Id: I5bcc86ebf696549b142a7ceb312eb8ec4be5e2bf
Reviewed-on: https://gerrit.chromium.org/gerrit/26257
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-27 20:04:52 -07:00
Mike Frysinger
c51e1f941d build_image: use pbzip2 on glibc debug info
Gives a minor speed up.

BUG=None
TEST=`./build_image --board=x86-alex dev` still works

Change-Id: I2c5251b788c557e9c76d05140aaed255003bb1e3
Reviewed-on: https://gerrit.chromium.org/gerrit/26258
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-27 19:17:10 -07:00
Stéphane Marchesin
060f3b7d9e Upgrade libva to 1.1.0.
BUG=none
TEST=emerged by hand

Change-Id: I18f1416535969930c041db35de2bcd0380425716
Reviewed-on: https://gerrit.chromium.org/gerrit/26177
Reviewed-by: Pawel Osciak <posciak@google.com>
Tested-by: Pawel Osciak <posciak@google.com>
Reviewed-by: Stuart Abercrombie <sabercrombie@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
2012-06-26 19:02:01 -07:00
Mike Frysinger
e94c0766a3 build_image: fix /usr/lib/debug handling with dev images
gdb only looks in /usr/lib/debug, not anywhere in /usr/local.  So
unpack the C library stuff into the common /usr/local/usr/lib/debug
and symlink /usr/lib/debug to the /usr/local tree.  This way gdb can
find all these things automatically.

BUG=None
TEST=run gdb on board and see it find .debug files automatically

Change-Id: I93bd352ccac52d9d0179537d2eb520da6f684697
Reviewed-on: https://gerrit.chromium.org/gerrit/25270
Reviewed-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-06-26 16:08:44 -07:00
Liam McLoughlin
924dae0521 Correct flag name for hybrid MBR option
BUG=chromium-os:32150
TEST=Build image using --hybrid_mbr flag

Change-Id: Iecd9204ab005ea03b131b86d9bd0019b720f1019
Reviewed-on: https://gerrit.chromium.org/gerrit/26144
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Ready: Liam McLoughlin <lmcloughlin@chromium.org>
Tested-by: Liam McLoughlin <lmcloughlin@chromium.org>
2012-06-26 15:47:58 -07:00
Mike Frysinger
aa58465a3f update hooks: add feedback messages to slow chrome cleanup
Some people think this upgrade hook gets stuck when in reality, it has
to delete a lot of files (gigs worth).  Add some progress messages so
people know it's doing something.

BUG=chromium-os:32052
TEST=manually running 25_suppress_incremental_build_across_chroot showed pretty messages

Change-Id: Ie20980fb2c60c980b617e98d68b0e5f9633fbb2a
Reviewed-on: https://gerrit.chromium.org/gerrit/26111
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-26 15:47:55 -07:00
Matt Tennant
298f61ab25 build_packages: Upload command stats after each run.
This changelist adds code in common.sh to support collecting command
statistics before calling upload_command_stats to upload those stats
to an appspot instance.

The presence of a file at ~/.disable_build_stats_upload will disable
all uploading of build command stats.

BUG=chromium-os:27355
TEST=`build_packages --board=x86-generic` with missing appspot instance
  shows upload error but still goes through with build.
TEST=`build_packages --board=x86-generic` with real appspot instance
  completes upload with all expected stats and does not affect build.
TEST=From outside chroot:
`touch ~/.disable_build_stats_upload`
`cros_sdk`
'build_packages --board=x86-generic`
Nothing uploaded due to .disable file
TEST=Verified that putting 'set -u' in my fake build_packages
caused an exit in print_time_elapsed, then fixed unbound variable
in print_time_elapsed, then rerun passed.
TEST=`cbuildbot -g <cl> --lkgm mario-paladin` passed
TEST=`cbuildbot -g <cl> --lkgm link-release` passed

Change-Id: Ieb714522cb32d7558b661e4ee1a197d1fce2c516
Reviewed-on: https://gerrit.chromium.org/gerrit/26084
Tested-by: Matt Tennant <mtennant@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Matt Tennant <mtennant@chromium.org>
2012-06-26 13:58:51 -07:00
Liam McLoughlin
07279034a9 Add option to create a hybrid MBR
This allows booting on boards that require their bootloader be on
the first partition of a MBR formatted disk

BUG=chromium-os:32150
TEST=Build an image using the --hybrid_mbr_hack flag, verify that
the ESP is visible on a system with GPT support

Change-Id: I4b137ef672b9ed7327bd42ec0a260d82a8c9d470
Reviewed-on: https://gerrit.chromium.org/gerrit/26071
Tested-by: Liam McLoughlin <lmcloughlin@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Ready: Liam McLoughlin <lmcloughlin@chromium.org>
Reviewed-by: Liam McLoughlin <lmcloughlin@chromium.org>
2012-06-26 13:58:51 -07:00
Mike Frysinger
41a20345b0 build_packages: drop native emerge --info
Posting the emerge info for the native build isn't terribly useful, so
just punt it to clean up the build output slightly.

BUG=None
TEST=`./build_packages --board=x86-alex` still works

Change-Id: If4ddb437b68c5624f3bc1a7519ef409134ba687b
Reviewed-on: https://gerrit.chromium.org/gerrit/26044
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-26 11:07:44 -07:00
David James
9d9efefe27 Revert "build_packages: Upload command stats after each run."
This reverts commit 615fe57ff0.

This CL broke mod_image_for_recovery.sh with the following failure:
  common.sh: line 684: $2: unbound variable

This bug is easy to fix, but suggests the CL needs more testing, so
we're going to revert for now and re-submit the CL once it's been
verified to pass on release trybots.

Example failure:
  http://chromegw.corp.google.com/i/chromeos/builders/x86-mario%20canary/builds/2214/steps/Archive/logs/stdio

BUG=chromium-os:27355
TEST=None, since this is reverting a change that broke the tree.

Change-Id: I61d182e3dcee267a8d9dea3b547fa6a75140d974
Reviewed-on: https://gerrit.chromium.org/gerrit/26077
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: David James <davidjames@chromium.org>
2012-06-25 18:57:10 -07:00
Matt Tennant
615fe57ff0 build_packages: Upload command stats after each run.
This changelist adds code in common.sh to support collecting command
statistics before calling upload_command_stats to upload those stats
to an appspot instance.

The presence of a file at ~/.disable_build_stats_upload will disable
all uploading of build command stats.

BUG=chromium-os:27355
TEST=`build_packages --board=x86-generic` with missing appspot instance
  shows upload error but still goes through with build.
TEST=`build_packages --board=x86-generic` with real appspot instance
  completes upload with all expected stats and does not affect build.
TEST=From outside chroot:
`touch ~/.disable_build_stats_upload`
`cros_sdk`
'build_packages --board=x86-generic`
Nothing uploaded due to .disable file

Change-Id: Iac071d1cc55a44335fc7c846960c7ae45fc93ed8
Reviewed-on: https://gerrit.chromium.org/gerrit/19401
Tested-by: Matt Tennant <mtennant@chromium.org>
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Matt Tennant <mtennant@chromium.org>
2012-06-25 15:16:36 -07:00
Jon Salz
73f002b0fb Upgraded the lockfile, python-daemon Portage packages
Upgraded dev-python/lockfile to version 0.9.1 on amd64, arm, x86
Upgraded dev-python/python-daemon to version 1.6 on amd64, arm, x86

BUG=None
TEST=emerged and used manually

Change-Id: Idb3a31b6a2405c15a9af333d3c06f982b0f5cf38
Reviewed-on: https://gerrit.chromium.org/gerrit/24943
Reviewed-by: Jon Salz <jsalz@chromium.org>
Tested-by: Jon Salz <jsalz@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-25 07:15:55 -07:00
Gilad Arnold
a7536efa24 Temporarily reinstate support for --to=/dev/sdX
This is part of some user's workflow and should be deprecated with
proper advance notice.

- Added a deprecation warning when --to=/dev/sdX is used in
  image_to_usb.sh.

- Removed mention of /dev/sdX from the output of build_image. Also
  simplified this output a bit (it should be obvious to a user who just
  invoked build_image that the other scripts should be invoked
  similarly, from inside the chroot's scripts directory).

BUG=chromium-os:32023
TEST=Invoked image_to_usb.sh with different --to values

Change-Id: Ib93d1b55f425b0978c4a9680be7755ae031c46e6
Reviewed-on: https://gerrit.chromium.org/gerrit/25819
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
2012-06-25 07:15:45 -07:00
Mike Frysinger
f5a383d366 setup_board: look up sdk targets only
We don't care about non-sdk targets when setting up the host boards,
so only load those for processing.

BUG=None
TEST=`cbuildbot chromiumos-sdk` passed

Change-Id: Ifa0f82a8c9704862a714fd9f35cbd11d809e295f
Reviewed-on: https://gerrit.chromium.org/gerrit/25626
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-06-19 17:11:06 -07:00
Yunlian Jiang
cee49c91f9 Upgraded sys-devel/gcc-config to version 1.7.3 on amd64
BUG=None
TEST=cbuildbot chromious-sdk, daisy, lumpy

Change-Id: Ia5febd7f869b660571d9ae378b73ab8c92fd458e
Reviewed-on: https://gerrit.chromium.org/gerrit/25132
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Commit-Ready: Yunlian Jiang <yunlian@chromium.org>
2012-06-19 14:46:08 -07:00
Vincent Palatin
a6fe9aa0a9 Upgraded the jimtcl, openocd Portage packages
Upgraded dev-lang/jimtcl to version 0.70_pre20110317 on amd64
Upgraded dev-embedded/openocd to version 0.5.0 on amd64

BUG=chrome-os-partner:7420
TEST=flash Link EC using OpenOCD
sudo USE="ftdi" emerge openocd
sudo openocd -f src/platform/ec/chip/lm4/servo_v2.cfg

Change-Id: Ibb8b83fbaa1cc9563c42bc4b1e42449b4a7878ce
Reviewed-on: https://gerrit.chromium.org/gerrit/25546
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
2012-06-18 15:21:45 -07:00
Gilad Arnold
29228ecfe7 Upgraded the GD Portage package
Upgraded dev-perl/GD to version 2.460.0 on amd64, needed for
dev-util/lcov.

BUG=None
TEST=dev-util/lcov builds cleanly on host.

Change-Id: If0fb3837bc86e60880597206472d71d81e5e3b03
Reviewed-on: https://gerrit.chromium.org/gerrit/25532
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
2012-06-18 09:44:13 -07:00
Mike Frysinger
7f2ebbde6b pass down board info to cros_setup_toolchains
If the board we're building includes extra toolchains that aren't part
of our official set, we need to make sure cros_setup_toolchains still
tries to set them up for us.

BUG=None
TEST=`cbuildbot chromiumos-sdk` works
TEST=`./setup_board --board=x32-generic` installs an extra toolchain

Change-Id: I85f70177f82bdf295eb2cd8668a031317a3b6e61
Reviewed-on: https://gerrit.chromium.org/gerrit/24336
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-17 22:13:40 -07:00
Gilad Arnold
20d65a5c90 image_to_usb.sh: disallow --yes/-y without an explicit target (--to)
This should prevent situations where a wrongfully detected target device
(e.g. a hard drive) is being written to without any prompt. With this
change, the semantics of --yes changes to "don't ask me if I'm sure,
just write to the target device in --to". The help line was changed to
reflect this semantics.

Minor changes:

- Replaced die calls with die_notrace.

- Changed the default value for --to into an empty string (why should it
  be /dev/sdX anyway?).

- Fixed an unmount warning message so it's more descriptive (and fits in
  80 columns).

- Check that --install is only used inside the chroot earlier in the
  script.

BUG=None
TEST=Ran the script with different combinations of -y and --to.

Change-Id: I7a4d6eac9697f25d7e1eddb6c34f3c1725a83ef4
Reviewed-on: https://gerrit.chromium.org/gerrit/25404
Reviewed-by: Brian Harring <ferringb@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
2012-06-17 04:06:06 -07:00
Luigi Semenzato
2443fdd62e Add hook for personalizing chroot.
This places a simple hook in cros_sdk by executing commands
in $HOME/.cros_chroot_init when a chroot is built.  This
lets users copy files to the chroot (for instance, scripts), as
well as add lines to .bash_profile and other rc files.

BUG=chromium-os:31295
TEST=tested manually and verified .cros_chroot_init is executed when present

Change-Id: I2a5b070a9827272f7bb7b3d340ad6937b0bef329
Reviewed-on: https://gerrit.chromium.org/gerrit/23668
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Luigi Semenzato <semenzato@chromium.org>
Commit-Ready: Luigi Semenzato <semenzato@chromium.org>
2012-06-14 11:24:37 -07:00
Shawn Nematbakhsh
1c92118c34 Upgraded the iwl2030-ucode Portage package.
Upgraded net-wireless/iwl2030-ucode to version 18.168.6.1 on amd64, x86.
For support of Intel 2230 N wireless.

BUG=none
TEST=Tested emerge command, verified 2230 wireless card works OK

Change-Id: I7d66c14e3b277993d5ffc82298ec8ddef25cf195
Reviewed-on: https://gerrit.chromium.org/gerrit/25236
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Shawn Nematbakhsh <shawnn@chromium.org>
Tested-by: Shawn Nematbakhsh <shawnn@chromium.org>
2012-06-13 21:52:34 -07:00
Mike Frysinger
db0a3903d1 setup_board: switch over to cros_setup_toolchains for toolchain listing
We want to centralize toolchain.conf parsing in cros_setup_toolchains.

BUG=None
TEST=`cbuildbot chromiumos-sdk` worked

Change-Id: I650616725595388515c8b1acbf7479b9ddcdd44e
Reviewed-on: https://gerrit.chromium.org/gerrit/24334
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-13 18:56:31 -07:00
Daniel Kurtz
c6db461e27 Upgraded the xf86-input-mouse Portage package
Upgraded x11-drivers/xf86-input-mouse to version 1.7.1 on amd64, arm, x86

The xf86-input-mouse is really only used in non-Linux based systems.
The chromium-os tree is carrying a custom patch to x-i-mouse, although
the package itself isn't actually being used.

This patch uprevs to the latest upstream version in preparation for
another patch that will remove the custom chromium OS version.
This is just in case someone, someday might want to build a chromium OS
system that uses xf86-input-mouse.

BUG=chromium-os:31764
TEST=cbuildbot --remote -g <changeId> {arm,x86,amd64}-generic-full

Change-Id: Ia9bf65006697e1bc8d6732d95e93ce4ec198bb04
Reviewed-on: https://gerrit.chromium.org/gerrit/25173
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
2012-06-13 17:11:09 -07:00
David James
654a00bd61 Stop the gvfsd-trash daemon during enter_chroot.
The gvfsd-trash daemon interferes with mounting and unmounting
images, so it should also be disabled for user chroots.

The gvfsd-trash daemon automagically creates 'trash' subdirectory inside
any directory you mount and holds on to it for a little while, preventing
you from being able to unmount your mount point.

BUG=chromium-os:23443
TEST=Verify that this fix fixes cros_make_image_bootable for daisy on
     Ubuntu precise.

Change-Id: I8df4c999ed57d7025b63c971390448c93d404e83
Reviewed-on: https://gerrit.chromium.org/gerrit/25243
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Anush Elangovan <anush@google.com>
Tested-by: David James <davidjames@chromium.org>
2012-06-13 15:44:58 -07:00
Stéphane Marchesin
8c257eeb8d Upgrade to util-macros 1.17
This is needed by newer intel-gpu-tools.

Change-Id: Idbf8abde946bb83128d6cf1d102dca2b19c256f1
Reviewed-on: https://gerrit.chromium.org/gerrit/25161
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
2012-06-13 12:30:13 -07:00
David James
fae0a59e8b Stop the automounting daemon whenever we're inside the chroot.
If automounting is enabled while we're inside the chroot, simple mount /
unmount commands will fail, causing image building commands to fail flakily.

This allows for quick mount / unmount.

BUG=chromium-os:23443
TEST='cros_sdk true' works now and does not print warnings on systems that
     previously had race conditions in this case.

Change-Id: I18d725324cc42ab7c527d3b52479b6a90bc4172c
Reviewed-on: https://gerrit.chromium.org/gerrit/25166
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
2012-06-13 12:04:57 -07:00
Brian Harring
334050f24e Ensure .repo/alternates is writable by the invoking user.
The only way to trigger this is if references were set up, but
never instantiated.

BUG=chromium-os:31682
TEST=manual permission checking.

Change-Id: Ibfc9dadf838f554cd10411753b5769117b1b1d42
Reviewed-on: https://gerrit.chromium.org/gerrit/24932
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>
Commit-Ready: Brian Harring <ferringb@chromium.org>
2012-06-10 01:38:08 -07:00
Mike Frysinger
9c7eff8fca update hooks: add an upgrade for stale daisy
The daisy PFQ did not regenerate itself, so for people who tried to build
daisy again, they got a mix of stale binpkgs.  Now that things have been
manually cleaned up, we can deploy another upgrade hook just for daisy.

BUG=None
TEST=`./update_chroot` w/out daisy ran quick -> nothing to do
TEST=`./update_chroot` w/up-to-date daisy ran quick -> nothing to do
TEST=`./update_chroot` w/out-of-date daisy -> deleted & re-installed daisy

Change-Id: Id707a492f9cea7fb4c8b204d84c4fc3bca84c4b3
Reviewed-on: https://gerrit.chromium.org/gerrit/24908
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-08 16:59:41 -07:00
Mike Frysinger
3ba74cefcb update hooks: skip old dirs automatically
If we have old dirs (such as a previous migration), we might detect they
need migration for ldso too, but their name isn't a valid board.  So skip
those old dirs, and punt old ldso dirs in case they exist (failed previous
upgrade).

BUG=None
TEST=`./update_chroot` moved my old tegra2_kaen and arm-generic boards away, skipped the old softfloat ones, and deleted the previous ldso moves

Change-Id: I9ff316d6de2d9e982f93880426955bb0b49f00a1
Reviewed-on: https://gerrit.chromium.org/gerrit/24890
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-06-08 11:48:45 -07:00
Mike Frysinger
e1c7706041 update hooks: migrate arm boards to new ldso path
Now that glibc installs with the new arm hardfp ldso path, and gcc
generates ELFs with the new path, forcibly migrate existing boards
to the new path by having people rebuild everything.

BUG=None
TEST=`./update_chroot` moved my old tegra2_kaen and arm-generic boards away

Change-Id: I5fee57ff49a9533cc10cb82888014f7cb53033ac
Reviewed-on: https://gerrit.chromium.org/gerrit/24731
Reviewed-by: asharif <asharif@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-08 11:24:56 -07:00
David James
0103b59138 Clean up update_bootloaders.sh to avoid sleeping.
Right now update_bootloaders.sh occasionally sleeps for 5 seconds if the
developer machine has gvfs-gdu-volume-monitor installed. This sleep was
only necessary because the script pointlessly mounted the device and then
immediately unmounted it, thus triggering a race condition.

In this commit, I've removed the pointless mount/unmount, thus avoiding this
race. This removes the need for the sleep and for retrying the umount.

I also cleaned up the error checking so that failures to cleanup fail
the whole script now.

BUG=none
TEST=Run build_image.sh several times, verify it doesn't sleep for 5 seconds
     anymore. Also run remote trybot runs.

Change-Id: Iaa715e9644292f97356a341d17b147be2a5178d9
Reviewed-on: https://gerrit.chromium.org/gerrit/24632
Commit-Ready: David James <davidjames@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
2012-06-07 20:48:51 -07:00
David James
85dd140217 Rebuild host workon packages if they are changed.
Previously, if you were working on a cros_workon package on the host, it
would only get updated once -- after that, the package would never build
again.

With this change, we now rebuild host workon packages any time their
timestamp is modified. This replicates the same feature that we already
have for board packages.

BUG=chromium-os:12771
TEST=Verify that host workon packages are rebuilt when the timestamps change,
     and only when the timestamps change.

Change-Id: I31ef1d83dc591161a7cb55c4af806ee4a4212cdd
Reviewed-on: https://gerrit.chromium.org/gerrit/24782
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
2012-06-07 16:01:31 -07:00
Mike Frysinger
e6d11e7d64 busybox: update to latest stable Gentoo version
Upgraded sys-apps/busybox to version 1.20.1 on amd64, arm, x86

Needed to work with newer kernel headers.

BUG=None
TEST=`emerge-amd64-generic busybox` worked
TEST=`emerge-x86-generic busybox` worked

Change-Id: I0806168726f02fc0312d2310efd657c2c0ccdb48
Reviewed-on: https://gerrit.chromium.org/gerrit/24759
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Craig Harrison <craigdh@chromium.org>
2012-06-07 15:06:55 -07:00
David James
4c29c24c77 Only build cros-workon packages when they are changed.
BUG=chromium-os:27493
TEST=Verify that packages are only rebuilt when their modification times
     change (on either the ebuild or the content).

Change-Id: Iac44e86455d12601a25c8d02f14aa69a4829a330
Reviewed-on: https://gerrit.chromium.org/gerrit/24677
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
2012-06-07 14:33:26 -07:00
Mike Frysinger
9377f67b55 migrate to linux-headers
Rather than having a toolchain package we use for the cross-compilers and
installing a different one for the target build dir, use the same package.
This makes updating more logical as we only have to do it in one place.

BUG=chromium-os:24928
TEST=`cbuildbot amd64-generic-full` works
TEST=`cbuildbot arm-generic-full` works
TEST=`cbuildbot x86-generic-full` works
TEST=build_packages+build_image for x86-alex boots & works

Change-Id: Ib083c3d2eae75d6f5437203990599cdc837dd9dc
Reviewed-on: https://gerrit.chromium.org/gerrit/24722
Reviewed-by: Anush Elangovan <anush@google.com>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-06-07 12:07:43 -07:00
J. Richard Barnette
ea82dfb4dc Don't look in chroot-based paths outside the chroot, even in jest.
When bootstrapping a chroot, the test for "is this a private source
tree repo" looked under the source tree in ~/trunk/src.  That test
was reliable inside the chroot (during update_chroot), but from
outside the chroot (during bootstrapping) it depended on whether the
user had a ~/trunk/src with a certain file.

This change enforces correct behavior outside the chroot regardless
of the contents of the user's home directory.

BUG=chromium-os:31602
TEST=run the test case described in the bug report

Change-Id: I2150347fbad9c84af537f8c572908e6e5ce312b4
Reviewed-on: https://gerrit.chromium.org/gerrit/24659
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
2012-06-07 12:07:41 -07:00
Han Shen
8a67e87b5b Upgraded the libv4l Portage package
Upgraded media-libs/libv4l to version 0.8.8 on amd64, arm, x86

BUG=None
TEST=Built using gcc-4.7

Change-Id: Iacb116f95ee7d07ea8baa6579e2cd7b716820646
Reviewed-on: https://gerrit.chromium.org/gerrit/24556
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Han Shen <shenhan@chromium.org>
Commit-Ready: Han Shen <shenhan@chromium.org>
2012-06-06 10:23:17 -07:00
Denis Glotov
019be8526e Increase memory size of vm's to 2G
This is because ASAN bots autotests usually fail with out-of-memory.

More on the thread: https://groups.google.com/a/google.com/d/topic/chromeos-lab-infrastructure/Tuu4ir5Mc9c/discussion

BUG=chromium-os:24567
TEST=cbuildbot --local amd64-generic-asan -g I3b0f9156

Change-Id: I3b0f91566c45e0ef9e837995e353d7240ab9edea
Reviewed-on: https://gerrit.chromium.org/gerrit/24385
Commit-Ready: Denis Glotov <glotov@chromium.org>
Reviewed-by: Denis Glotov <glotov@chromium.org>
Tested-by: Denis Glotov <glotov@chromium.org>
2012-06-05 03:03:11 -07:00
Mike Frysinger
8b06bd5926 update hooks: migrate paths to userpriv settings (part 2)
The previous upgrade hook didn't change all the perms on files in the host
distdir because the default value expands to a symlink which `find` did not
walk.  Add the -H flag to make that happen.

For people who haven't upgraded yet, stub out the existing 38 hook.

BUG=chromium-os:3616
TEST=add a root owned file to host distdir, run ./update_chroot, see file owners fixed

Change-Id: I3f5f88b4fb1d27ce588a342331ad10e957961bcc
Reviewed-on: https://gerrit.chromium.org/gerrit/24459
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-06-04 20:01:05 -07:00
Chris Sosa
0e1709f295 Move warning message for mod_image_for_test before actual library call.
Users of other calling scripts that no-op in this scripts are seeing
the warning message incorrectly. Moving this message further down
avoids this issue.

BUG=None
TEST=Visual. Also using to test unified commit queue.

Change-Id: I7bc227f37b26bcedbdb8214286a3f8646ddb610c
Reviewed-on: https://gerrit.chromium.org/gerrit/24369
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Chris Sosa <sosa@chromium.org>
2012-06-04 03:08:35 -07:00
Mike Frysinger
0c66cf2412 powertop: pull down latest version from Gentoo
Upgraded sys-power/powertop to version 2.0 on amd64, arm, x86

This one fixes building with gcc-4.7.

BUG=None
TEST=`emerge-amd64-generic powertop` worked
TEST=`emerge-arm-generic powertop` worked
TEST=`emerge-x86-generic powertop` worked

Change-Id: I5abdb5e03b822efe8757e80bb9c4dbf3526d72ab
Reviewed-on: https://gerrit.chromium.org/gerrit/24311
Reviewed-by: Han Shen <shenhan@google.com>
Reviewed-by: Han Shen <shenhan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-06-01 13:13:24 -07:00
Mike Frysinger
6e52ff1f3d update hooks: migrate paths to userpriv settings
Now that we're enabling userpriv for the chroot, we need to fix all the
paths that might be owned by root to the right user.

BUG=chromium-os:3616
TEST=`./update_chroot` on a system with root-owned files
	in the various paths changed them all to my user

Change-Id: I3655c851d5844524ec77c3476cee7a6e9d70ce0d
CQ-DEPEND=Id513c0b8b380d57dd3e150917a969d0bf36883fc
Reviewed-on: https://gerrit.chromium.org/gerrit/24216
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-06-01 12:35:43 -07:00
Zdenek Behan
7d2634e5da update_hooks: add a hook to unmerge old and conflicting cross headers
BUG=none
TEST=./update_chroot

Change-Id: Id67b2f486821558d72a73445621f4685a0cf5a54
Reviewed-on: https://gerrit.chromium.org/gerrit/24235
Tested-by: Zdenek Behan <zbehan@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Zdenek Behan <zbehan@chromium.org>
2012-05-31 19:50:37 -07:00