Fix section header regex so that bracket expansion syntax won't be
recognized as section header. The only requirement is that section
header must start at the beginning of a line.
BUG=chrome-os-partner:5850
TEST=1. Create a config file (mp_factory.conf) with the following
content:
[x86-zgb]
--factory ~/trunk/src/build/images/${BOARD}/latest/chromiumos_factory_image.bin
--release ~/trunk/src/build/images/${BOARD}/latest/[Cc]hromiumos_image.bin
--hwid_updater ~/trunk/src/platform/[Cc]hromeos-hwid/hwid_bundle_zgb.sh
--firmware_updater none
--detect_release_image # Comment.
# More comments.
[x86-zgb-he]
--subfolder x86-zgb-he
--factory ~/trunk/src/build/images/${BOARD}/latest/chromiumos_factory_image.bin
--release ~/trunk/src/build/images/${BOARD}/latest/chromiumos_image.bin
--hwid_updater ~/trunk/src/platform/chromeos-hwid/hwid_bundle_zgb.sh
--firmware_updater none
--detect_release_image
2. BOARD=x86-zgb ./make_factory_package.sh --config mp_factory.conf
Change-Id: I4d1475a5e513e7e0e06a5c3c6d46d13e2120668c
Reviewed-on: http://gerrit.chromium.org/gerrit/7698
Tested-by: Chinyue Chen <chinyue@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
The setup_board script now inserts a BOARD_USE value into
/build/<board>/etc/make.conf.board_setup. This only happens the first
time the board is setup, so this upgrade script inserts that value
for boards that were previously set up.
BUG=chromium-os:20341
TEST=Ran run_chroot_version_hooks in chroot, inspected make.conf.board_setup
files for boards that did and did not have BOARD_USE already set.
Change-Id: I333198a0434076a5e8e50db6affc81ea2076d301
Reviewed-on: http://gerrit.chromium.org/gerrit/7653
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Matt Tennant <mtennant@chromium.org>
Works around:
http://code.google.com/p/chromium-os/issues/detail?id=20378
which is breaking the tree.
BUG=chromium-os:20378
TEST=cros_sdk --enter
Change-Id: I0d5dc2dd6466efe9baafcc404648d2c53309a3b7
Reviewed-on: http://gerrit.chromium.org/gerrit/7679
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Thieu Le <thieule@chromium.org>
Tested-by: David James <davidjames@chromium.org>
BUG=chromium-os:12138
TEST=Adhoc
TESTED_ON=Kaen
Build an image. Look for "Generating root fs hash tree (salt <foo>)." in the
output. Boot the image, grep for 'salt=' in dmesg. All should be well.
Change-Id: Ia7d8504033ff1e62ba451129be5796702809cc7c
Signed-off-by: Elly Jones <ellyjones@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/7335
This changes ABI of the mpfr library, but the ebuild itself takes care
of preserving the old SONAME so that existing binaries don't break.
Newly linked programs will use the new ABI SONAME automatically.
BUG=None
TEST=tested upgrade path (build_packages/build_image); ran `cbuildbot chromiumos-sdk`
Change-Id: Id35f8369f9d245de12f5c491db61d8dbac7ddc56
Reviewed-on: http://gerrit.chromium.org/gerrit/7442
Reviewed-by: Ken Mixter <kmixter@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This changes ABI of the gmp library, but the ebuild itself takes care
of preserving the old SONAME so that existing binaries don't break.
Newly linked programs will use the new ABI SONAME automatically.
BUG=None
TEST=tested upgrade path (build_packages/build_image); rebuilt strongswan; ran `cbuildbot chromiumos-sdk`
Change-Id: I0e51efecd59a9f2127e2d299a4da7e23df5eefd2
Reviewed-on: http://gerrit.chromium.org/gerrit/7441
Reviewed-by: Ken Mixter <kmixter@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
BUG=None
TEST=ran `cbuildbot chromiumos-sdk` to rebuild all pkgs
Change-Id: Ic98d07cb801b6e8e1b12a5879354723aeaa61b7d
Reviewed-on: http://gerrit.chromium.org/gerrit/7308
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This reverts commit 8cca16afdc0b722136723a0bd4213d70e73b9e9f which broke the tree
Change-Id: Icf3c1b0ac71452b012d4199c7408c0157d3202b6
Reviewed-on: http://gerrit.chromium.org/gerrit/7485
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Tested-by: Raymes Khoury <raymes@chromium.org>
make_factory_package.sh needs many parameters and to support multi-board
installation it has to be run twice (without and with --subfolder). This
change adds the functionality to read sections of parameters from a
config file and executes them in order.
BUG=chrome-os-partner:5850
TEST=1. Create a config file (mp_factory.conf) with the following
content:
[x86-zgb]
--factory ~/trunk/src/build/images/${BOARD}/latest/chromiumos_factory_image.bin
--release ~/trunk/src/build/images/${BOARD}/latest/chromiumos_image.bin
--hwid_updater ~/trunk/src/platform/chromeos-hwid/hwid_bundle_zgb.sh
--firmware_updater none
--detect_release_image
[x86-zgb-he]
--subfolder x86-zgb-he
--factory ~/trunk/src/build/images/${BOARD}/latest/chromiumos_factory_image.bin
--release ~/trunk/src/build/images/${BOARD}/latest/chromiumos_image.bin
--hwid_updater ~/trunk/src/platform/chromeos-hwid/hwid_bundle_zgb.sh
--firmware_updater none
--detect_release_image
2. BOARD=x86-zgb ./make_factory_package.sh --config mp_factory.conf
Change-Id: I3435f3afbf40ec3b8bd02a3514f599a7a535510e
Reviewed-on: http://gerrit.chromium.org/gerrit/7473
Tested-by: Chinyue Chen <chinyue@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Also drop find_*_component, because it is not used anywhere anymore.
BUG=chrome-os-partner:5459
TEST=none
Change-Id: Iea49a81538c22fee4b91c8b3e5582b5174282151
Reviewed-on: http://gerrit.chromium.org/gerrit/7425
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Anton Staaf <robotboy@chromium.org>
Upstream has added a few minor improvements, and released 1.4.3.
BUG=chromium-os:19940
TEST=For an x86- and a tegra2- board:
build_packages --board=${B}
Test keyboard, USB mouse and touchpad function as expected.
Change-Id: I54b668c682f11c4b97d19824a1264f086016e61a
Reviewed-on: http://gerrit.chromium.org/gerrit/7087
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
To always have HWID bundles in build output, this CL copies the HWID bundle
files from board temporary space into build output folder.
The HWID folder in make_netboot is also removed.
BUG=chrome-os-partner:5796
TEST=./build_image --factory
# see "hwid" folder in build output
Change-Id: I8c2cd32c257b117261fba3654b52929c71310c82
Reviewed-on: http://gerrit.chromium.org/gerrit/7331
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Right now, output directories are hardcoded in boot.desc. This means that
cros_make_image_bootable will still write to the directories mentioned in
build_image, even if it's working on a different directory. This can
mess with the buildbot, because it can cause cros_make_image_bootable
to mess with the files created for existing images.
This change fixes flaky failures where the buildbot fails with warnings
stating that vmlinuz_hd.vblock does not exist. See bug 19956.
BUG=chromium-os:19956
TEST=Run full canary trybot run and verify cros_make_image_bootable uses
files from the right directory now.
Change-Id: Ib390aa84570b077cbc8b69b757998056acc091ea
Reviewed-on: http://gerrit.chromium.org/gerrit/7282
Reviewed-by: Will Drewry <wad@chromium.org>
Tested-by: David James <davidjames@chromium.org>
The upstream version contains all of our fixes, so import the upstream
version so we can drop the cros one.
BUG=None
TEST=emerged it for x86-alex and arm-generic boards
Change-Id: I903782f27932a2cd6bae503e89e4ac77d1e0fd6a
Reviewed-on: http://gerrit.chromium.org/gerrit/7194
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
BUG=chromium-os:19613
TEST=below
1) Manually create a chroot with old gcc
2) Let the script update&select new one, unmerge old
Change-Id: I71732da315ed4effc6df48afab797718e44d7a06
Reviewed-on: http://gerrit.chromium.org/gerrit/7117
Tested-by: Zdenek Behan <zbehan@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
This version includes upstream the pkg-config NSS check, and two more
security-sensitive issues.
This reverts commit 4ca8da3aecfc66f90389c9d59825d5fdf89d87de
BUG=none
TEST=emerge-{x86,arm}-generic ecryptfs-utils
Change-Id: I46c50989206a0a50b0d3c08e9c635232f2d30f96
Reviewed-on: http://gerrit.chromium.org/gerrit/7210
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Luigi Semenzato <semenzato@chromium.org>
Import i7z-0.27-r1 from gentoo.
Also pull in qt4-r2 eclass from gentoo, which i7z
ebuild inherits.
BUG=chromium-os:19663
TEST=gmerge i7z. Ensure the utility runs
from /usr/sbin/i7z on a Sandy Bridge system.
Change-Id: I51e31e1015790dedb1ad5dbd7ac3734476af05dd
Signed-off-by: Benson Leung <bleung@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/7196
Reviewed-by: Mike Frysinger <vapier@chromium.org>
BUG=chromium-os:12138
TEST=Adhoc
TESTED_ON=Kaen
Build an image. Look for "Generating root fs hash tree (salt <foo>)." in the
output. Boot the image, grep for 'salt=' in dmesg. All should be well.
Change-Id: If9dbefbd8a875d06ff45cd54704f166c2511c3b7
Signed-off-by: Elly Jones <ellyjones@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/7174
Upstream has added a few minor improvements, and released 2.0.2.
BUG=chromium-os:13270
TEST=For an x86- and a tegra2- board:
build_packages --board=${B}
Test keyboard, USB mouse and touchpad function as expected.
Change-Id: I75ce14981275c2aaedd8bcf56330a5b7741cf493
Reviewed-on: http://gerrit.chromium.org/gerrit/7086
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
BUG=chromium-os:19565
TEST=Manually ran script
Change-Id: I7f565ddd2e06f4b25aa5d47614cedf7bec786580
Reviewed-on: http://gerrit.chromium.org/gerrit/7093
Reviewed-by: Daniel Erat <derat@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Thieu Le <thieule@chromium.org>
BUG=None
TEST=updated busybox, created a recovery image, booted it, recovered system, booted recovered system
Change-Id: I7f7a5389ed0ec63f807cbd0d4aee4f0fbde192ee
Reviewed-on: http://gerrit.chromium.org/gerrit/6736
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Anush Elangovan <anush@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
BUG=None
TEST=run both scripts, boot the images
Change-Id: I7209421d3b438d6daf37f210d5e73c0b9f91eb1d
Reviewed-on: http://gerrit.chromium.org/gerrit/6941
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
This version includes upstream the pkg-config NSS check, and two more
security-sensitive issues.
BUG=none
TEST=emerge-{x86,arm}-generic ecryptfs-utils
Change-Id: I0401838ad1bb59393c6fd7a3e4b161b6dca4e449
Reviewed-on: http://gerrit.chromium.org/gerrit/6965
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Tested-by: Diego Elio Pettenò <flameeyes@chromium.org>
We need more flexible image creation tool for various layout, like "RMA with
multiple release images" which needs 4 images (install, test, release A,
release B).
To make the creation of image more flexible, this CL changes
make_universal_factory_shim to using a "layout file" that can describe any disk
image format we want.
Image creation speed is also improved by aligning partition offsets and
restricting oflag=dsync applied only when being used for block devices so that
make_universal_factory_shim (outputs to a normal temporary file) becomes faster
by utilizing system cache.
For a system with every images already cached:
- Time for building 3 in 1 factory instal shim:
Before = 8 seconds, After = 5 seconds.
- Time for full RMA shim creation:
Before = 1m25s, After = 40-50 seconds.
BUG=chrome-os-partner:4108
TEST=./make_universal_factory_shim.sh image1 image2 image3 image4
# boots correctly after being imaged to SD card.
./make_factory_package.sh --usbimg RMA ....
# RMA image can install images and works correctly
Change-Id: I645196d6d6e0a24d3dfa4c413a338279df4c0d5b
Reviewed-on: http://gerrit.chromium.org/gerrit/6893
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Nick Sanders <nsanders@chromium.org>
This is the counterpart of http://gerrit.chromium.org/gerrit/6992 ,
which moves init modification from scripts folder into ebuild file.
The 'customizeRelease' is also already deprecated.
BUG=chromium-os:9596
TEST=build_images --factory # pass
Change-Id: I8087f627f4b13d9f6b1d4bf6003630298a87c627
Reviewed-on: http://gerrit.chromium.org/gerrit/7040
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Avoid playing with keywords i the ebuilds, instead use package.keywords
on chromiumos-overlay to set the keywords, and USE flags as well.
This actually includes some ebuild commit-revision updates, which actually
update said keywords.
BUG=none
TEST=./build_packages --nousepkg --board={x86,arm}-generic
Change-Id: I1e2acab0527b8cfd1ceb97c9fd578c5087d1eb50
Reviewed-on: http://gerrit.chromium.org/gerrit/6889
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Diego Elio Pettenò <flameeyes@chromium.org>
Recently, a gcc-4.4.6 has been unmasked in the host, but no effort
has been made to make sure the developers select it with gcc-config.
BUG=chromium-os:19613
TEST=ran the tests below with set -x and observed
1) manually set the MINIMUM version to 4.4.7, see it fail
2) two gccs, current + old, set to old, observed the switch and unmerge
3) above, but set to new, same result
4) only one gcc, the current, observed nothing happening
5) only have old gcc, let the script update&select new one, unmerge old
Change-Id: Id2a285a13f5b27d7531eae4db35e36f6b8cc5f4f
Reviewed-on: http://gerrit.chromium.org/gerrit/6694
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Zdenek Behan <zbehan@chromium.org>
BUG=chromium-os:19868
TEST=build_image --factory # see output as chromiumos_factory_image.bin
build_image --test # see output as chromiumos_test_image.bin
Change-Id: Ice1aa576cfe297db0900e6c42de8d362aa94729a
Reviewed-on: http://gerrit.chromium.org/gerrit/6993
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
The current code will silence stderr when operating in non-verbose mode
because it always turns on shell tracing with `set -x`. Unfortunately,
this also ends up killing error messages from a bunch of places in the
script as well:
- look for all the "1>&2" uses in mod_image_for_recovery.sh
- look at missing error() override
- look at duplication of die() just to undo things
A really simple example:
$ ./mod_image_for_recovery.sh
$
Did it work? Or did I do something wrong? Who knows!
So undo the stderr silencing and simply turn on `set -x` only when
requested (verbose mode).
BUG=None
TEST=forced some errors in non-verbose mode and saw no output before change, but saw it after change; made a working recovery image
Change-Id: I31578fba091e390a56a437af97782a621e2137fb
Reviewed-on: http://gerrit.chromium.org/gerrit/6904
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
BUG=chromium-os:19854
TEST=Ran it
STATUS=Verified
Change-Id: I2fd7d77145e3607c29cfc64500fca8525e9b5992
Reviewed-on: http://gerrit.chromium.org/gerrit/6939
Reviewed-by: Kris Rambish <krisr@chromium.org>
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Stanley Wong <stanleyw@chromium.org>
Tested-by: Stanley Wong <stanleyw@chromium.org>
BUG=None
TEST=run the commands in various combinations.
Change-Id: I94fb167d8312a90818910085adebfb1d0396cdbe
Reviewed-on: http://gerrit.chromium.org/gerrit/6866
Reviewed-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Vince Laviano <vlaviano@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
The process of updating the Portage package status spreadsheet on
buildbots requires a credentials file at ~/.gdata_cred.txt in the
chroot. All buildbot VMs have this file outside the chroot now,
so this change adds that file to the list of things created in
the user's homedir when entering the chroot.
BUG=None
TEST=Run cros_sdk in these scenarios:
~/.gdata_cred.txt exists -> Same file should be at $HOME in chroot
~/.gdata_cred.txt does not exist -> No file created in chroot
Change-Id: I5c0f333a9308f5efa5324ce2e202a7c9e9fdb48b
Reviewed-on: http://gerrit.chromium.org/gerrit/6911
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Tested-by: Matt Tennant <mtennant@chromium.org>
