After CL:39921, I get the following warning every time I enter the chroot:
ln: failed to create symbolic link `.../chroot/root/.boto': File exists
All bots get this error as well. This is caused because CL:39921, causes
~/trunk to no longer resolve outside the chroot, so it's invalid for processes
outside the chroot to try to resolve paths inside there. Fix cases where we do
this inside enter_chroot.sh.
BUG=chromium-os:37347
TEST=cros_sdk doesn't print warnings anymore.
Change-Id: Iaeb9b7407e12397bce1600bd51559be20f998fdf
Reviewed-on: https://gerrit.chromium.org/gerrit/41571
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Upgraded dev-lang/yasm to version 1.2.0-r1 on amd64
Same as 1.2.0, but this includes a patch to support the x32 abi.
BUG=chromium-os:36866
TEST=`cbuildbot chromiumos-sdk` works
Change-Id: Id6f527e9e7d2b63c9f0ae972579280d34d1b25ce
Reviewed-on: https://gerrit.chromium.org/gerrit/41444
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
We don't need to support POSIX shell, so convert to bash.
BUG=None
TEST=`cbuildbot {amd64,x86,arm}-generic-full chromiumos-sdk daisy-release` worked
Change-Id: I33ad25d2310c593f3e346d955e3aa27da41091fc
Reviewed-on: https://gerrit.chromium.org/gerrit/41271
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This pulls in the latest libatomic_ops from Gentoo. It should work
for all our targets unmodified.
BUG=chromium-os:14262
TEST=`emerge-x86-alex libatomic_ops gtalk` works
TEST=`emerge-stumpy libatomic_ops gtalk` works
TEST=`emerge-daisy libatomic_ops gtalk` works
TEST=`emerge-x32-generic libatomic_ops` works
Change-Id: I2f8c4b8a9f8a1f65df3b3d40995f6f210300bb24
Reviewed-on: https://gerrit.chromium.org/gerrit/40592
Reviewed-by: Noah Richards <noahric@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Upgraded net-misc/socat to version 1.7.2.1 on amd64, arm, x86
BUG=chromium-os:36866
TEST=`emerge-daisy socat` worked
TEST=`emerge-stumpy socat` worked
TEST=`emerge-x86-alex socat` worked
TEST=`emerge-x32-generic socat` worked
Change-Id: I101954c678297e6488ab81e5afaf16b05a87a7aa
Reviewed-on: https://gerrit.chromium.org/gerrit/41267
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Issues flagged during unittest run; bit unsure how this got missed
since trybots were involved (Presuming human error).
BUG=chromium-os:37347
TEST=trybot run
Change-Id: Ib6e49d28f9427197a0abd0e4da68d2f628dc2803
Reviewed-on: https://gerrit.chromium.org/gerrit/41203
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>
Slipped past during rename of the chroot upgrade script from
49 to 50; name was slightly changed but full re-validation of the
rename wasn't done (thus the typo slipped past testing, and review).
Simplify the code via removal of invoking the upgrade script, instead
just doing the relevant commands (fixing chroot awareness issues in
the process).
BUG=None
TEST=manual cros_sdk invocation
Change-Id: I122de8b4cf7ec0845643e09e7919cbcdbd0bb79a
Reviewed-on: https://gerrit.chromium.org/gerrit/41202
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>
Rather than having to find /home/${SUDO_USER:-${USER}}/trunk, instead
just look for /mnt/host/trunk (defined by common.sh as $CHROOT_TRUNK_DIR).
This simplifies code flow, and is a requirement for shoving chromite
into PYTHONPATH globally w/in the chroot.
BUG=chromium-os:37347
TEST=cros_sdk --replace; cros_sdk w/ chroot upgrade.
Change-Id: I9ee3e6556541a91193f49cbf74ffc5a8e090537f
Reviewed-on: https://gerrit.chromium.org/gerrit/39921
Tested-by: Brian Harring <ferringb@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
This is useful for debugging, e.g. --to /dev/null. The user will have to
use --force_non_usb to allow this, in which case all bets are off and we
should let her do this. Also note that, before this fix, using --to
/dev/null would have given a strange error message (target device does
not exist); with it, we're handling all devices in a more comprehensive
way, spitting the right error message when appropriate.
BUG=None
TEST=--to /dev/null dies as expected; works with --force_non_usb
Change-Id: I514e14e1f7cc49b3d6172a2a53aa6da33ef5ecfd
Reviewed-on: https://gerrit.chromium.org/gerrit/41133
Commit-Queue: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
By default, pv automatically infers and uses the full width of the
terminal. This generally makes sense for a console application, but in
the case of pv it just causes the progress bar to be ridiculously wide
when run on wide terminals, to the point it's hard to read. This CL is
setting it to 80 characters, the widely accepted standard width for
a terminal, in cases where the terminal appears to be larger than
80 columns. Note that:
* Even with -w, pv appears to be resizing the progress bar as the
terminal width changes midway through the run. This means that if
a user widens the window, then the progress bar will go wide again and
there's nothing to be done about it.
* Theoretically, in very rare cases this may lead to a progress bar the
exceeds the width of the terminal (i.e. set to 80 columns on
a terminal that has just shrunk to fewer columns). The odds for such
timing are close to nil and even then the damage is minimal.
* This will work for non-terminal runs, or otherwise runs where stty
does not produce any output.
* To avoid the initialization overhead for all common.sh inclusion,
replacing the variable with a function that prints the pv/cat command.
BUG=None
TEST=Ran ./image_to_usb on wide and narrow terminal windows, it works.
Change-Id: I549df1dd29e93909ea646ae9b9e09d9a588ad382
Reviewed-on: https://gerrit.chromium.org/gerrit/40937
Commit-Queue: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
This is needed as I2C device driver is also built-in for install shim
kernel.
BUG=chrome-os-partner:16712
TEST=Build netboot image and check I2C device driver is included.
Change-Id: I71f21eea9cf599454fe18bd8adeeaa629d851db6
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/41076
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
mod_image_for_test.sh doesn't work anymore so nobody should be using it.
There are a few places where scripts try to use mod_image_for_test.sh,
and these are timebombs because they fail if a test image needs to actually
be produced.
BUG=chromium-os:31183
TEST=Tested that this script doesn't produce any images anymore, so
it should be fine to delete it.
Change-Id: If80337407023d62f76117dc44cadfa46801ca236
Reviewed-on: https://gerrit.chromium.org/gerrit/40955
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
BUG=chromium-os:37727
TEST=emerge-{x86,amd64,arm}-generic sys-fs/exfat-utils
Change-Id: I15892a5cfb66abc16ba8e07004d550fc553c1dab
Reviewed-on: https://gerrit.chromium.org/gerrit/40949
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
BUG=chromium-os:37727
TEST=`emerge-x86-alex fuse-exfat` worked
TEST=`emerge-stumpy fuse-exfat` worked
TEST=`emerge-daisy fuse-exfat` worked
Change-Id: I3e232c5f348fd0668bbb1735f70206219af49cc0
Reviewed-on: https://gerrit.chromium.org/gerrit/40623
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
As USB/SD install shim might be used for ARM devices now, it is
reasonable to move ARM factory install shim to initramfs like on x86.
This converges the code path and build process for ARM and x86.
BUG=chrome-os-partner:15884
TEST=Install with install shim and netboot on Spring.
Change-Id: Ic8d7328502181ca909be3d7542be34f2a904523f
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/40931
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
As suggested by Mike Frysinger, this ancient clang is not used, so we
can delete it now.
TEST=None
BUG=None
Change-Id: Iad4b8f6db35141ad142f5a3742ada0c0bb32f4a6
Reviewed-on: https://gerrit.chromium.org/gerrit/40462
Reviewed-by: Han Shen <shenhan@google.com>
Reviewed-by: Denis Glotov <glotov@chromium.org>
Commit-Queue: Guozhi Wei <carrot@google.com>
Tested-by: Guozhi Wei <carrot@google.com>
Reviewed-by: Han Shen <shenhan@chromium.org>
Upgraded dev-util/stressapptest to version 1.0.4 on amd64, arm, x86
BUG=None
TEST=Test commands are listed below:
emerge-x86-generic dev-util/stressapptest
emerge-daisy dev-util/stressapptest
emerge-lumpy dev-util/stressapptest
Change-Id: I1120f3f969f7a9c3eb30257667487464619dd332
Reviewed-on: https://gerrit.chromium.org/gerrit/40547
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Bruce Kuo <brucekuo@chromium.org>
Commit-Queue: Bruce Kuo <brucekuo@chromium.org>
Sometimes update_engine isn't running on the device because of a possibly bad
Chrome, etc. So don't assume it is running and always attempt to start it before
updating.
BUG=none
TEST=stop update-engine on the device.
./bin/cros_image_to_target.py ... works.
Change-Id: I9aeaed80a9a82f9f685e58774fa987877ec635c9
Reviewed-on: https://gerrit.chromium.org/gerrit/40285
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: asharif <asharif@chromium.org>
Tested-by: asharif <asharif@chromium.org>
Upgraded sys-devel/smatch to version 1.57-r1 on amd64
BUG=chromium-os:37416
TEST="sudo emerge smatch" in chroot
Change-Id: I16a3e029ca900c63936385ab5ac0ad664a5252ba
Reviewed-on: https://gerrit.chromium.org/gerrit/40459
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Simon Que <sque@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Upgraded media-plugins/alsa-plugins to version 1.0.25-r1 on amd64, arm, x86
This includes a fix for building with newer glibc versions.
BUG=None
TEST=`emerge-x86-alex alsa-plugins` still works
Change-Id: Ic2d9ad454b6e0676e1cc35195ac2fc7894800c93
Reviewed-on: https://gerrit.chromium.org/gerrit/40463
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Upgraded x11-proto/xproto to version 7.0.23-r1 on amd64, arm, x86
This includes a fix from upstream for x32 builds.
BUG=chromium-os:36866
TEST=`emerge-x32-generic libXmu` now works
TEST=`cbuildbot {amd64,x86,arm}-generic-full` works
Change-Id: I86479d940a524cf807eaddd0d9de0b03f17fe2c0
Reviewed-on: https://gerrit.chromium.org/gerrit/40187
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Upgraded dev-libs/libaio to version 0.3.109-r3 on arm, x86
BUG=None
TEST=after upgrading locally, executing following instructions:
emerge-x86-alex dev-libs/libaio
emerge-daisy dev-libs/libaio
Change-Id: I953c839552d58ed994354ffc63cc315f51698403
Reviewed-on: https://gerrit.chromium.org/gerrit/40306
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Bruce Kuo <brucekuo@chromium.org>
Commit-Queue: Bruce Kuo <brucekuo@chromium.org>
crosutils cros_build_lib is deprecated in favor of
chromite.lib.cros_build_lib. Remove unused functions to encourage folks
to migrate over to chromite.lib.cros_build_lib instead.
Info and GetCallerName are only used internally so we add an underscore
prefix to discourage others from using it.
BUG=chromium-os:24660, chromium-os:21287
TEST=pylint. Unit tests. Trybot runs.
CQ-DEPEND=CL:40300, CL:40311
Change-Id: Ia34d2770db2c2678b8966f6dceb2164b0a3333a2
Reviewed-on: https://gerrit.chromium.org/gerrit/40301
Tested-by: David James <davidjames@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
CrOS could be used in devices that dont have custom firmware to
interpret the Kernelblock (Part2,4). In such devices skip trying
to make the kernelblock
BUG=none
TEST=./build_image --board=chronos test and verify we dont build the kernel block
Change-Id: I3e9a8dd765ea00db2ebf112553d96c08960e544f
Reviewed-on: https://gerrit.chromium.org/gerrit/40219
Commit-Queue: Anush Elangovan <anush@chromium.org>
Reviewed-by: Anush Elangovan <anush@chromium.org>
Tested-by: Anush Elangovan <anush@chromium.org>
The configure script will add -m64 to x86_64 targets. This
doesn't make sense for actual 64bit targets, and breaks x32
targets. Update the sed to match upstream Gentoo's ebuild.
BUG=chromium-os:36866
TEST=`emerge-x32-generic tpm-tools` now works
Change-Id: If9a8527ee87101938b62c2b43c96746883800e95
Reviewed-on: https://gerrit.chromium.org/gerrit/40186
Reviewed-by: Kees Cook <keescook@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Now that we have an ebuild for factory install shim, let's move to that
instead of base image.
BUG=chrome-os-partner:16712
TEST=Test network boot, install shim, RMA shim on Link.
Test install shim on Snow.
CQ-DEPEND=CL:39952
Change-Id: Ib6a7a598087647b44a4aeca970e293ea72023890
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/39955
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Upgraded sys-devel/smatch to version 1.57 on amd64
BUG=chromium-os:37416
TEST="sudo emerge smatch" in chroot
Change-Id: Ib547cbd94c46551ef231cf7b650d323edce57bef
Reviewed-on: https://gerrit.chromium.org/gerrit/40086
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Simon Que <sque@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Similar to the uinput module, install the testcases/ tree of modules
only on test images.
BUG=chromium-os:37353
TEST=daisy test image build has modules, production does not.
CQ-DEPEND=I16eee5afd1664f0ab4a9ab48b6cb2beaa6f30017
Change-Id: I5e7a48936b3fb45f49ff7ca4d592d46150c5610c
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/39920
Reviewed-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Grant Grundler <grundler@chromium.org>
Upgraded sys-apps/coreutils to version 8.20 on amd64, arm, and x86
This version includes the realpath package, so drop that from the
tree so people don't try to install/depend on it anymore.
This also includes a fix for the issue that caused it to be reverted
before -- broken `cp --no-preserve=mode`.
BUG=chromium-os:24204
TEST=`cbuildbot chromiumos-sdk` worked
TEST=`cbuildbot {amd64,arm,x86}-generic-full` worked
Change-Id: I473dee144dddacefe4ad60279497ce7e8e8c11c7
Previous-Reviewed-on: https://gerrit.chromium.org/gerrit/39312
Reviewed-on: https://gerrit.chromium.org/gerrit/39967
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Moving to the cirrus driver (instead of std) so we can support
cirrus-fb, in preparation for nonroot-X support.
BUG=chromium-os:388
TEST=local build, run with x86-generic
Change-Id: Ic7d5776f673ac3c15680d62331345d55985f1d73
Reviewed-on: https://gerrit.chromium.org/gerrit/39900
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: John Sheu <sheu@chromium.org>
Commit-Queue: John Sheu <sheu@chromium.org>
Upgraded sys-apps/fbset to version 2.1 on x86
For fbdev testing for nonroot-X effort
BUG=chromium-os:388
TEST=local build, run on x86
Change-Id: I7fe298a80f2c17d9bf008ef517e95ed3da713c5b
Reviewed-on: https://gerrit.chromium.org/gerrit/39993
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: John Sheu <sheu@chromium.org>
Commit-Queue: John Sheu <sheu@chromium.org>
Upgraded dev-util/stressapptest to version 1.0.4 on amd64, x86, arm
Use this in factory test to help stress test.
Originally we add it on autotest dependency but now
we want to move the test to pytest, so planning to merge this
package into portage-stable and make it build in factory package
BUG=None
TEST=Manual
Change-Id: I52b592553c994ffcc79342ffb4bf6ba79ad7d0c1
Reviewed-on: https://gerrit.chromium.org/gerrit/39975
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Bruce Kuo <brucekuo@chromium.org>
Tested-by: Bruce Kuo <brucekuo@chromium.org>
Upgraded sys-apps/pv to version 1.3.4 on amd64, arm, x86
BUG=chromium-os:31052
TEST=`cbuildbot chromiumos-sdk` worked
TEST=`cbuildbot {amd64,arm,x86}-generic-full` worked
TEST=`image_to_usb.sh` worked
Change-Id: I81e35f430eb0788e31a79f2403c036284dd08896
Reviewed-on: https://gerrit.chromium.org/gerrit/39864
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Setting the flag will cause make.conf to set the ACCEPT_LICENSE
environment variable.
BUG=chromium-os:37312
TEST=remote trybots
Change-Id: Id478b7cfb8c37d363da46b1d74f33143e8ea159f
Reviewed-on: https://gerrit.chromium.org/gerrit/39801
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Force a re-emerge of host libtool
BUG=chromium-os:37334
TEST=Added fake "4.6.x-google" version string to libtool and ran
./update_chroot and verified libtool was re-emerged
Change-Id: I82d3da181831a7718b230305c5aca7899d591c2d
Signed-off-by: Allen Martin <amartin@nvidia.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/39858
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Simple sync from upstream.
BUG=chromium-os:37312
TEST=None
Change-Id: I3ed19b232a0eb1ce49fbe4ad595e1b4ed7c402e0
Reviewed-on: https://gerrit.chromium.org/gerrit/39863
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
There's no need to store to a temporary file when updating the kernel
partition. Just stream straight to the right partition. This appears
to save about .5 seconds.
BUG=None
TEST=Time update_kernel and see savings; verify that kernel still gets
updated.
Change-Id: I5afead3e70720ee6dc9e6a822ef1a98032d93b79
Reviewed-on: https://gerrit.chromium.org/gerrit/39783
Commit-Ready: Doug Anderson <dianders@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
Upgraded sys-apps/util-linux to version 2.21.2 on amd64, arm, x86
BUG=chromium-os:36939
TEST=`cbuildbot chromiumos-sdk` worked
TEST=`cbuildbot {amd64,arm,x86}-generic-full` worked
Change-Id: I0bfc91448b72761982996822def0c5efaf7d3bb2
Reviewed-on: https://gerrit.chromium.org/gerrit/39761
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This was identified in CL:39304, but not corrected before landing.
BUG=None
TEST=bash -n build_packages
Change-Id: I17cefc883e191d33a3569d7f53ab2e0a85417da9
Reviewed-on: https://gerrit.chromium.org/gerrit/39753
Commit-Ready: Brian Harring <ferringb@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>
This reverts commit ac55e1639ab0957e6d61c2a0b3ce1e4bb109cead
ToT on lumpy with this patch reverted passes all bvt tests. This has somehow caused DBus services to no longer be reachable.
TEST=remote trybot hwtest
BUG=chromium-os:37219
Change-Id: I3f09ad254c6df0e67c0c1b3451d007ad9566cf1b
Reviewed-on: https://gerrit.chromium.org/gerrit/39661
Commit-Ready: Alex Miller <milleral@chromium.org>
Tested-by: Alex Miller <milleral@chromium.org>
Reviewed-by: Alex Miller <milleral@chromium.org>
