Commit Graph

28179 Commits

Author SHA1 Message Date
J. Richard Barnette
8a7aa3e502 Delete unnecessary -d options from umount
The -d option to umount is unnecessary in cases where the original
mount was created with '-o loop' (it says so in the man page).
Moreover, there's a demonstrable bug when using 'umount -d' in this
case:  umount complains that it's unable to delete the loop device
in this case.  This change silences those messages.

The demonstrated bug in umount is a plausible explanation for build
failures characterized by unexpected failures of 'mount -o loop';
see the BUG, below.

BUG=chromium-os:24975
TEST=run the changed commands, see no loopback devices leaked

Change-Id: I1df9f60b40eabd279164b79ee66994ff9f644ee9
Reviewed-on: https://gerrit.chromium.org/gerrit/15998
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
2012-02-15 18:23:14 -08:00
Mike Frysinger
c436de9adb mass import remaining target packages from portage/
These are the remaining packages used from portage/ but just for the
target boards.  Import them in one shot.

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

Change-Id: Iddc2024cbddf85400b1d682707e445d0052e115c
Reviewed-on: https://gerrit.chromium.org/gerrit/15859
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-15 09:09:01 -08:00
Mike Frysinger
f457ec6a57 pyyaml: update to newer rev of this ebuild
We need a newer rev of this ebuild version to work with the newer python
eclass, so grab it from Gentoo.

BUG=chromium-os:26016
TEST=`emerge-arm-generic pyyaml` works
TEST=`emerge-amd64-generic pyyaml` works
TEST=`emerge-x86-alex pyyaml` works
TEST=`cbuildbot arm-generic-full` works

Change-Id: I82a35db4b32e0e879f4c3ecdb7552b3d90b5f549
Reviewed-on: https://gerrit.chromium.org/gerrit/15827
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-15 07:53:43 -08:00
Mike Frysinger
f934f4e31c pyserial: sync amd64 to same version as arm/x86
Some targets were using 2.5_rc1 and others were using 2.5_rc2.  Update
everyone to the latest version to avoid that.

BUG=chromium-os:26016
TEST=`emerge-amd64-generic pyserial` works
TEST=`cbuildbot arm-generic-full` works

Change-Id: I6d449255b215320f5548b78be0fbec717d6622c0
Reviewed-on: https://gerrit.chromium.org/gerrit/15826
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-15 07:53:43 -08:00
Gilad Arnold
7293bd8524 image_to_usb.sh: warn before copying to non-existent /dev/sdX device.
Without this fix, when the script is invoked with (say) --to=/dev/sdk
but /dev/sdk is not a valid block device, we will interpret it as if the
user intended to copy the image to a file of the same name. However, it
is more likely that the user specified the wrong device name.  Hence,
this fix catches this type of error and will fail the operation with
a corresponding error message.

Also includes minor changes to printed messages.

BUG=None
TEST=Ran the script with different values of --to

Change-Id: Ie060ff2be77b8c065ba95f635455049e034d4bbc
Reviewed-on: https://gerrit.chromium.org/gerrit/15822
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
2012-02-14 14:41:13 -08:00
Gilad Arnold
dd59d7e9a6 image_to_usb.sh: do not require chromiumos_image.bin when --test_image is used.
The recent changes to image_to_usb.sh assumed that chromiumos_image.bin
is always used for generating a test image. This wasn't the case before
these changes were applied, where a preexisting test image would have
sufficed.  This fix eliminates image autodetection entirely when
--test_image it used and falls back to the old behavior: if a test image
exists, it will use it; otherwise, it will generate it from the image
specified by --image_name, or from the default chromiumos_image.bin.

This is not to say that I like this behavior: it is subtle, may lead to
errors (e.g. using a stale test image whereas the user assumes a new one
should be generated), and inconsistent with other behaviors (e.g.
installing a recovery image, where no image generation takes place at
all).  I believe that long term we should eliminate the generation of
test images from image_to_usb.sh and have users invoke the necessary
scripts (like mod_image_for_test.sh) explicitly.

BUG=chromium-os:26239
TEST=Ran script with different combinations of --test_image,
--image_name and image files present.

Change-Id: Ib2491a7e45e23eb51ced6ef31d3f129ec7863a25
Reviewed-on: https://gerrit.chromium.org/gerrit/15764
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
2012-02-14 13:08:17 -08:00
Gilad Arnold
a0a02f4c3a Extended device autodetection to work with --to_product.
This both fixes an incorrect behavior where --to_product would unsafely
lead to using a target device not intended to by the user; and reuses
the existing logic for device autodetection to work with provided
product strings.  As a result, it is easier to find devices, and the
script's behavior is more consistent as far as device detection and
selection.  This preserves the pattern matching on product string (now
properly highlighted in usage text and inline comments).

BUG=None
TEST=Ran script with various flag combinations (--to, --to_product),
product strings,  and devices connected.

Change-Id: I80bfca086029555853a680e7c97251b11adc912e
Reviewed-on: https://gerrit.chromium.org/gerrit/15757
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
2012-02-14 10:11:20 -08:00
Han Shen
b91d73d7cf Roll out binutils 2.21-r4 version (setup_board part).
Includes 2 important bug fixes -
- bug fix for 24128 (fix glibc2.14 builds) (bfd)
- fix for ARM toolchain hardening (gold)

-------------------------------------------
Summary
-------------------------------------------
                                            vanilla       newbinutils
Autotest Key                    Iterations  Average       Average       Change
PageCyclerTests
de..ageCyclerTest.Alexa_usFile  5           218.08        217.93        1.00
de..  PageCyclerTest.BloatFile  5           22064.06      22145.45      1.00
de.. PageCyclerTest.MorejsFile  5           524.82        525.95        1.00
de..  PageCyclerTest.Intl1File  5           446.69        448.81        1.00
de..  PageCyclerTest.DhtmlFile  5           630.95        630.09        1.00
de..s   PageCyclerTest.MozFile  5           187.07        187.70        1.00
de../desktopui_PageCyclerTests  5           ALL PASS      ALL PASS      -
de..   PageCyclerTest.Moz2File  5           188.75        187.13        0.99
de..  PageCyclerTest.Intl2File  5           682.23        684.26        1.00
bvt   					    ALL PASS      ALL PASS      -
suite_Smoke                                 ALL PASS      ALL PASS      -

BUG=None
TEST=Built chromeos from scratch, and ran PageCyclerTests, bvt and suite_Smoke.

Change-Id: I85281eaee1702de0cc89e093caf70a5d45ccce14
Reviewed-on: https://gerrit.chromium.org/gerrit/15537
Commit-Ready: Han Shen <shenhan@chromium.org>
Reviewed-by: Han Shen <shenhan@chromium.org>
Tested-by: Han Shen <shenhan@chromium.org>
2012-02-14 10:11:20 -08:00
Mike Frysinger
227b452d3d dev-python/*: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

BUG=chromium-os:26016
TEST=`cbuildbot arm-generic-full` works
TEST=build_packages+build_image boots x86

Change-Id: Iba5f8cdbfd2a518944c7bcf26f91c9ffa826f149
Reviewed-on: https://gerrit.chromium.org/gerrit/15760
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-14 07:30:03 -08:00
Mike Frysinger
5f8a90b910 util-linux: import from upstream Gentoo
Grab the latest stable version from upstream.

BUG=chromium-os:24839
TEST=`emerge util-linux` works
TEST=`emerge-arm-generic util-linux` works
TEST=build_packages+build_image for x86-alex boots up
CQ-DEPEND=Ie30c3b74003fa8aa99109ebf60d77f61864a2c1c

Change-Id: Id029e027711451a79baa57f11af8049e545a9551
Reviewed-on: https://gerrit.chromium.org/gerrit/12624
Reviewed-by: Ben Chan <benchan@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-13 20:49:25 -08:00
Ahmad Sharif
211259aacd Changed the logic to discover the gcc atom from the config.
The gcc-config file name could be different from the gcc atom that creates it.
Changed the logic to first find out the binary path of gcc and then to query
portage to see what package owns that path.

BUG=none
TEST=cros_sdk --bootstrap --replace
cros_sdk -- ./setup_board --board=x86-zgb --nousepkg

Change-Id: I3ccfa9948aaba6ba28107f150523c8a5d7cf1260
Reviewed-on: https://gerrit.chromium.org/gerrit/15556
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Tested-by: asharif <asharif@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: asharif <asharif@chromium.org>
2012-02-13 14:30:30 -08:00
Stuart Abercrombie
60b16d6bf0 Add mtdev, a new dependency of xf86-input-evdev.
BUG=25404

Change-Id: Idf989d4e5587d61cdba2b5800f8364bb19cadf60
Reviewed-on: https://gerrit.chromium.org/gerrit/15709
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Stuart Abercrombie <sabercrombie@chromium.org>
Commit-Ready: Stuart Abercrombie <sabercrombie@chromium.org>
2012-02-13 12:54:41 -08:00
Mike Frysinger
7b6d3d6f56 sys-apps/file: update to latest Gentoo stable
We need a newer version that supports latest python eclass.

BUG=chromium-os:26016
TEST=`emerge file` works
TEST=`emerge-arm-generic file` works
TEST=build_packages+build_image boots x86, and `file` on the target works
TEST=`cbuildbot arm-generic-full` works

Change-Id: I2f9e7cf18aecebdc54d5c3298ac18b8c006c97b0
Reviewed-on: https://gerrit.chromium.org/gerrit/15759
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-13 12:32:59 -08:00
Eric Shienbrood
2725a191a3 Imported dev-cpp/ctemplate-1.0 ebuild from portage.
BUG=chromium-os:24140
TEST=sudo emerge hard-host-depends and see that ctemplate
gets built and installed.

Change-Id: Ie77a197c35ffc134f30ee43835e6c98ddfe4fb27
Reviewed-on: https://gerrit.chromium.org/gerrit/15755
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Eric Shienbrood <ers@chromium.org>
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Tested-by: Eric Shienbrood <ers@chromium.org>
2012-02-13 09:56:11 -08:00
Mike Frysinger
59d3d736a7 get_latest_image.sh: error out when image dirs are missing
Every consumer that I can find of get_latest_image.sh expects this
script to output something useful.  Many don't check the result and
end up spitting out unhelpful messages when it doesn't.  So make a
missing images dir fatal for this script so everyone on top of us
gets this checking for free.

If, in the future, someone actually wants this to output nothing
when there's nothing found, we can add a dedicated flag.  That mode
of operation is a lot less common than having it die by default.

BUG=None
TEST=delete image tree, run ./get_latest_image.sh --board=${BOARD}, see it fail nicely
TEST=delete image tree, run ./image_to_vm.sh --board=${BOARD}, see it fail nicely

Change-Id: I0a2ffd0b9084297b6d2346f02dbdb7bd0ef667bf
Reviewed-on: https://gerrit.chromium.org/gerrit/15589
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-13 08:51:43 -08:00
Chris Sosa
2b73600f7f Update the copyright year in common.sh.
BUG=None
TEST=visual.

Change-Id: I66d6a6901930cfeb6391df5064f247e7148e5c80
Reviewed-on: https://gerrit.chromium.org/gerrit/15747
Commit-Ready: Chris Sosa <sosa@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
2012-02-12 16:45:48 -08:00
Zdenek Behan
0b33e0a6d3 setup_board: make the gcc/glibc version stable by default, take 4
This is needed as part of transition to cros-workon.

Crossdev has a -S option to install the current stable, which is
the preferred future option, but would greatly complicate the logic.

BUG=chromium-os:25338
TEST=setup_board --board=any --force, see it build the right versions
TEST=trybot chromiumos-sdk

Change-Id: I60dfffcfa38e482499f909787ead26fd27ef36e1
Reviewed-on: https://gerrit.chromium.org/gerrit/15702
Commit-Ready: Zdenek Behan <zbehan@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Tested-by: Zdenek Behan <zbehan@chromium.org>
2012-02-11 18:59:56 -08:00
Mike Frysinger
8312b41d6d virtual/mta: migrate to new-style virtual
Upstream Gentoo has moved to a new-style virtual for mta, so do the same
in our tree by importing the latest upstream ebuild.

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

Change-Id: I748a429b1bdb97144f7e9e05a3db9ccc6ad14c95
Reviewed-on: https://gerrit.chromium.org/gerrit/15599
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-10 21:26:52 -08:00
Mike Frysinger
2b279d0fd6 setuptools: update to newer version from upstream
The current stable version in portage/ doesn't work with newer python
eclass, so we have to import a newer version from upstream that does.

BUG=chromium-os:26016
TEST=`emerge setuptools` works
TEST=`cbuildbot arm-generic-full` works
TEST=build_packages+build_image for x86-alex boots

Change-Id: I06b02058072c0e12c0ae90e4bba5a1d349fde2f1
Reviewed-on: https://gerrit.chromium.org/gerrit/15596
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-10 21:26:52 -08:00
Mike Frysinger
683f398504 dev-cpp/gflags: import from portage & update
I had to grab a newer rev of this ebuild from upstream Gentoo to work
with the newer distutils.eclass.

BUG=chromium-os:26016
TEST=`emerge gflags` works
TEST=`cbuildbot arm-generic-full` works
TEST=build_packages+build_image for x86-alex boots

Change-Id: If9c1d4d760846bbaa76ec512cbead46b9b935c5c
Reviewed-on: https://gerrit.chromium.org/gerrit/15595
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-10 21:26:52 -08:00
David James
a69b68deb7 Remove aura special case in setup_board.
Now that aura is default, we don't need to special-case it anymore.

BUG=chromium-os:25818
TEST=Verify that default prebuilts uploaded by the x86-generic builder
     are used now instead of the aura-specific prebuilts. These prebuilts
     have aura enabled now, since it is the default.

Change-Id: I8b78f53f5ceab6e5907390e03554120f20ea96fe
Reviewed-on: https://gerrit.chromium.org/gerrit/15726
Tested-by: Ryan Cui <rcui@chromium.org>
Reviewed-by: Ryan Cui <rcui@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
2012-02-10 17:18:34 -08:00
Mike Frysinger
c8092f4072 dev-libs/*: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I906166d2db93aa0e7cfff8fd492669731db0d731
Reviewed-on: https://gerrit.chromium.org/gerrit/15594
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-10 14:15:57 -08:00
Mike Frysinger
b7e3540857 dev-util/{boost-build,ctags,dejagnu,gob,gperf,intltool}: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I2f15a17efcc3ef1ac08ba6b59074fc9236199055
Reviewed-on: https://gerrit.chromium.org/gerrit/15593
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-10 14:15:56 -08:00
Mike Frysinger
328fce31b7 app-text/*: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I24076698d982e35a5e192e334c2615919cf3f140
Reviewed-on: https://gerrit.chromium.org/gerrit/15592
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-10 14:15:56 -08:00
Doug Anderson
5be7f8e7e7 Upgraded the smdk-dltool Portage package
Upgraded dev-embedded/smdk-dltool to version 0.20-r2 on amd64.  This
fixes smdk-dltool to work properly for recovery.

BUG=chromium-os:26083
TEST=Manual:
1. Plug SMDK board in with USB 2.0 hooked up to host.  Set dip switches
   to boot from SD and have no SD card.
2. cd to a directory with WIP u-boot
3. Set BL1 to point to your BL1 binary.
4. sudo /usr/bin/smdk-usbdl -a 0x02021400 -f ${BL1}
5. sudo /usr/bin/smdk-usbdl -a 0x02023400 -f bl2.bin
6. sudo /usr/bin/smdk-usbdl -a 0x43e00000 -f u-boot.bin

Change-Id: I7d71a2288df662858d30685b9d5c3cb06c66a3ee
Reviewed-on: https://gerrit.chromium.org/gerrit/15533
Tested-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Doug Anderson <dianders@chromium.org>
2012-02-10 10:21:35 -08:00
Mike Frysinger
9ae6a5881d x11-libs/{cairo,gtk+,libXt}: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: Idc3a36d15a65e4f1e89f3e7db2d5d0867a8b29e5
Reviewed-on: https://gerrit.chromium.org/gerrit/15598
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-10 09:55:19 -08:00
Mike Frysinger
17d049c287 libglade: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I43eaf902c26a88e46b9745856c0903eb34450d28
Reviewed-on: https://gerrit.chromium.org/gerrit/15597
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-10 09:55:19 -08:00
Mike Frysinger
d5d23b8d5a Revert "setup_board: make the gcc/glibc version stable by default, take 3"
This reverts commit 19754342048a44304150981b2938f604751605e7

The tree is on fire: the x86 canaries and x86 generic full
bots are dying with internal gold link errors.
http://crosbug.com/26168

Only happens on new sdks, so we're shotgunning a few
suspicious revs and hoping for the best.

Change-Id: Iae05c876ff2a84f4a9f549f74b2ee7e0903f2b5a
Reviewed-on: https://gerrit.chromium.org/gerrit/15669
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-10 09:31:40 -08:00
Zdenek Behan
cdf3bad8a3 setup_board: make the gcc/glibc version stable by default, take 3
This is needed as part of transition to cros-workon.

Crossdev has a -S option to install the current stable, which is
the preferred future option, but would greatly complicate the logic.

BUG=chromium-os:25338
TEST=setup_board --board=any --force, see it build the right versions
TEST=trybot chromiumos-sdk

Change-Id: I07c1ade5731e9391fb22a572f7fe8517011e6239
Reviewed-on: https://gerrit.chromium.org/gerrit/15176
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Zdenek Behan <zbehan@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Zdenek Behan <zbehan@chromium.org>
2012-02-09 18:58:59 -08:00
Matt Tennant
f7c9e7785b Copy ~/.gdata_token to chroot upon enter_chroot.
The refresh-packages builder needs to start using auth tokens for logging into
Google Docs, rather than email/password each time, so this copies ~/.gdata_token
into the chroot in the same way as ~/gdata_cred.txt.

BUG=chromium-os:23819
TEST=Put a file at ~/.gdata_token outside chroot, then run:
`cros_sdk true ; cmp {chroot/home/$USER/,~/}.gdata_token`, which passes.

Change-Id: Ib688a01aa88e0fd0f0211236bb0354813ef1fbb3
Reviewed-on: https://gerrit.chromium.org/gerrit/15550
Commit-Ready: Matt Tennant <mtennant@chromium.org>
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Tested-by: Matt Tennant <mtennant@chromium.org>
2012-02-09 17:27:44 -08:00
Gilad Arnold
0534a6ec41 image_to_usb.sh: detect and allow to select between candidate images.
The script does not assume a single source image (chromiumos_image.bin)
but detects which images of a list of candidate images are present, and
lets the user select one.  The default choice is the first image in the
list to be detected.  If only one image was detected, it will be
automatically selected.  The list contains the aforementioned standard
image, as well as the default names for recovery, test, factory and
factory install images.  If the script is invoked with --test, --factory
or --factory_install flags, it will only seek for the standard image
(and attempt to generate the desired image from it, as was previously
done).

Also fixed some log messages; option strings; and improved the logic for
unmounting the target device, eliminating an unnecessary message and
a 3 second delay.

BUG=chromium-os:26010
TEST=Tested image_to_usb.sh with different images and flags.
CQ-DEPEND=I53a42a46a3c90fd486fead578bfbae248f64cfc2

Change-Id: I0d2f20dc8d62ce5fa18c10d9f8b51a46b2ddca5d
Reviewed-on: https://gerrit.chromium.org/gerrit/15528
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
2012-02-09 15:19:57 -08:00
Gilad Arnold
207a7c7e7f common.sh: new function for a selection menu with a default option.
Defined a bash function choose(), which allows to present a menu and
prompting for a selection, with support for default choice. Usage is
commented appropriately.

Originally reviewed in CL I0d2f20dc8d62ce5fa18c10d9f8b51a46b2ddca5d.

BUG=chromium-os:26010
TEST=Tested in conjunction with a use in image_to_usb.sh, works fine.

Change-Id: I53a42a46a3c90fd486fead578bfbae248f64cfc2
Reviewed-on: https://gerrit.chromium.org/gerrit/15586
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
2012-02-09 13:31:41 -08:00
Mike Frysinger
97efc14290 app-crypt/mit-krb5: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: Ieceabe88930917f10441d1de89764f5ad60a0168
Reviewed-on: https://gerrit.chromium.org/gerrit/15503
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-09 12:59:41 -08:00
Mike Frysinger
c3e2aa44e0 dev-lang/{ruby,swig,tcl}: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: Id0fd34f497440b90da07392e9a78c3e98bae3fc1
Reviewed-on: https://gerrit.chromium.org/gerrit/15502
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-09 12:59:41 -08:00
Mike Frysinger
e438e62608 dev-db/sqlite: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I21b1c73258ff269dda7aa8d391fd1392df94de4f
Reviewed-on: https://gerrit.chromium.org/gerrit/15501
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-09 12:59:40 -08:00
Mike Frysinger
0ef33f75df media-libs/{lcms,tiff}: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I65f4c7b39f72492a41ab5b4eecdf63100b355760
Reviewed-on: https://gerrit.chromium.org/gerrit/15505
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-09 08:56:07 -08:00
Mike Frysinger
85b3525959 media-fonts/corefonts: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I6324e1ca04fa653f290e3b02f5c76ae973b098c8
Reviewed-on: https://gerrit.chromium.org/gerrit/15504
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-09 08:56:07 -08:00
Mike Frysinger
7cceccc229 x11-apps/mkfontscale: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: Id05bddafa7dbabdc5379cf3b1395a6c8d08d800d
Reviewed-on: https://gerrit.chromium.org/gerrit/15506
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-09 08:56:06 -08:00
Mike Frysinger
6759299f55 app-misc/{mime-types,realpath}: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: Iff210f228670dd9a6cb54452287d6170afdeaa50
Reviewed-on: https://gerrit.chromium.org/gerrit/15500
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-09 08:24:47 -08:00
Mike Frysinger
4fd2cb04df app-portage/{esearch,portage-utils}: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: Iad179b7933bf3f2b1481283b2861989734ce6bfe
Reviewed-on: https://gerrit.chromium.org/gerrit/15499
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-09 08:24:47 -08:00
Mike Frysinger
9642336aec app-arch/{gzip,libarchive,pigz,sharutils,unzip,xz-utils,zip}: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: Iadc0bdda902ca1226690638b06783d31755c1ba0
Reviewed-on: https://gerrit.chromium.org/gerrit/15498
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-09 08:24:46 -08:00
Mike Frysinger
71b7d0b4a5 add categories file
Just copying the metadata from portage/ so hopefully no functional changes.

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

Change-Id: I9797653ac46ae01687e6e4110b33c3a0d3c77848
Reviewed-on: https://gerrit.chromium.org/gerrit/15514
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-09 08:02:38 -08:00
Brian Harring
feb04f77fe Require sudo usage to be non-interactive.
First, add a enable_strict_sudo helpers that scripts that are
sudo strict can invoke.  This does a sanity check bailing immediately
if invoked from a non sudo-keep-alive context.

Second, update enter_chroot.sh and make_chroot.sh to be strict.

While this is strict, that's the point.  The aim of this is to block
the previous sudo interactive mess for spreading, let alone reappearing
in scripts/code that has been cleansed.

BUG=chromium-os:18393
TEST=cros_sdk --replace; in the midst of it, do sudo -k.
     cros_sdk should thus bail out w/ an appropriate error.
CQ-DEPEND=I01bb1466cf027401fa387af7fad15e42fd33aea4

Change-Id: I76c5b87a812cc78c30a2eb1a0c56b9e438f4a98f
Reviewed-on: https://gerrit.chromium.org/gerrit/15294
Commit-Ready: Brian Harring <ferringb@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>
2012-02-08 16:19:14 -08:00
Gilad Arnold
4ac8731001 mod_image_for_recovery.sh: some cleanup.
Motivated by the need to share the default recovery image name across
scripts (image_to_usb.sh in this case) and have it setup in common.sh.
Includes some general cleanup steps such flags and usage strings,
migrating function definitions to the beginning of the script, etc.

BUG=chromium-os:26010
TEST=Tested mod_image_for_recovery.sh on local host.

Change-Id: Ife3731915302a2e7be8beb750501d0ae9a0c43a4
Reviewed-on: https://gerrit.chromium.org/gerrit/15523
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
2012-02-08 14:44:56 -08:00
Mike Frysinger
bb3b2c17e1 sys-apps/kbd: upgrade to latest upstream Gentoo version
BUG=None
TEST=`cbuildbot x86-generic-full` worked

Change-Id: I3e0a4be52af54af0a2fe1e6f54f8452697fd8554
Reviewed-on: https://gerrit.chromium.org/gerrit/15397
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-08 12:09:17 -08:00
Gilad Arnold
083662748f common.sh: add a variable for default recovery image name.
This is a preparatory step for changes to image_to_usb.sh and
mod_image_for_recovery.sh.  In general, by migrating the default
recovery image name to common.sh we can improve the interoperability
between the different scripts.

BUG=chromium-os:26010
TEST=Obvious change; tested to see the mod_image_for_recovery.sh and
image_to_usb.sh still work.

Change-Id: I765d665b656d5d25b2d9b0e40bf5c05048c3f255
Reviewed-on: https://gerrit.chromium.org/gerrit/15507
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
2012-02-08 12:09:16 -08:00
Mike Frysinger
525320c758 net-libs/serf: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I1dcd252ebed1d89b61d976f8e56caca90352b344
Reviewed-on: https://gerrit.chromium.org/gerrit/15433
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
2012-02-08 12:09:15 -08:00
Mike Frysinger
0d7b3ae1fa numpy: stabilize for everyone
We have been unmasking newer versions for the target, but the cros
sdk has been lagging behind.  Sync the versions.

BUG=None
TEST=`cbuildbot x86-generic-full` worked

Change-Id: I922f0ef2e0f1f09bed1f57294def5b542b51fe88
Reviewed-on: https://gerrit.chromium.org/gerrit/15400
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-08 10:41:35 -08:00
Mike Frysinger
16abf6fe42 sys-devel/{automake,binutils-config}: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I55f0ad68a264fe93b4dd23c34a5ac8d7588e220c
Reviewed-on: https://gerrit.chromium.org/gerrit/15429
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-08 09:46:07 -08:00
Mike Frysinger
cf4e48a60a dev-perl/Locale-gettext: import from portage
Just copying the ebuilds from portage/ so hopefully no functional changes.

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

Change-Id: I71de898449eb48a420a7823646556c8b6b8196ec
Reviewed-on: https://gerrit.chromium.org/gerrit/15428
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
2012-02-08 09:46:06 -08:00