recovery installer: fix build_gpt and build_image

recovery installer: fix build_gpt and build_image

Change-Id: I3cbb62827a33894f47d26dd047134b6c39c6667b

[Tan Gao, 2010-06-24 02:05:02]

Hi Andrew,

This is (hopefully) the last CL of the series. This one copies the kernel
verification blob to stateful partition and replace it with /dev/zero (until we
can resign it properly)

PTAL,
Tan

[adlr, 2010-06-24 17:39:04]

http://codereview.chromium.org/2813029/diff/7001/8002
File build_image (right):

http://codereview.chromium.org/2813029/diff/7001/8002#newcode305
build_image:305: sudo touch "${STATEFUL_FS_DIR}/.recovery"
it looks like you're creating the file /mnt/stateful_partition/.recovery inside
part_3 (the rootfs). You should create the file /.recovery in part_1 (the
stateful partition).

Also, can you do this without changing build_image at all? Just create a new
script that transforms a built image to a recovery image.

[Tan Gao, 2010-06-24 21:18:21]

PTAL

(testing in process .. rebuilding takes time :-)

http://codereview.chromium.org/2813029/diff/7001/8002
File build_image (right):

http://codereview.chromium.org/2813029/diff/7001/8002#newcode305
build_image:305: sudo touch "${STATEFUL_FS_DIR}/.recovery"
nope. I just verified ".recovery" is created in part_1 (stateful partition) ..
we're good here

moved all logic to modify a base image for recovery purpose into a new script,
mod_image_for_recovery.sh

[adlr, 2010-06-24 23:10:34]

LGTM

http://codereview.chromium.org/2813029/diff/16001/17003
File mod_image_for_recovery.sh (right):

http://codereview.chromium.org/2813029/diff/16001/17003#newcode51
mod_image_for_recovery.sh:51: local start_kern_a=4096  # start offset of kernel
A (aligned to 4096b boundary)
put comment on separate line (80 col limit)

http://codereview.chromium.org/2813029/diff/16001/17003#newcode79
mod_image_for_recovery.sh:79: ${SCRIPTS_DIR}/mount_gpt_image.sh -u -r
"${ROOT_FS_DIR}" -s "${STATEFUL_FS_DIR}"
80 col wrap

http://codereview.chromium.org/2813029/diff/16001/17003#newcode90
mod_image_for_recovery.sh:90: exit 0
you can delete this line

[Tan Gao, 2010-06-24 23:31:41]

Thanks Andrew! submitting ...

[Tan Gao, 2010-06-24 23:31:51]

done

http://codereview.chromium.org/2813029/diff/16001/17003
File mod_image_for_recovery.sh (right):

http://codereview.chromium.org/2813029/diff/16001/17003#newcode51
mod_image_for_recovery.sh:51: local start_kern_a=4096  # start offset of kernel
A (aligned to 4096b boundary)
done.

http://codereview.chromium.org/2813029/diff/16001/17003#newcode79
mod_image_for_recovery.sh:79: ${SCRIPTS_DIR}/mount_gpt_image.sh -u -r
"${ROOT_FS_DIR}" -s "${STATEFUL_FS_DIR}"
On 2010/06/24 23:10:34, adlr wrote:
> 80 col wrap

Done.

http://codereview.chromium.org/2813029/diff/16001/17003#newcode90
mod_image_for_recovery.sh:90: exit 0
On 2010/06/24 23:10:34, adlr wrote:
> you can delete this line

Done.

[Benson Leung, 2010-06-25 01:03:35]

<nastygram from Build Sheriff>

Cleaning up /usr/local symlinks for
/home/chrome-bot/trunk/src/build/images/x86-generic/0.7.49.0-a1/stateful_partition/dev_image
/home/chrome-bot/trunk/src/scripts/chromeos-common.sh: line 252: FLAGS_recovery:
unbound variable
An error occurred in your build so your latest output directory is invalid.

Build is broken. Can you fix quickly, otherwise we'll revert.

[adlr, 2010-06-25 01:08:50]

Tan is gone for the day, it seems. Please revert this CL.

He submitted a slew of CLs today, so you may want to revert them all since
they are interrelated.

-andrew

On Thu, Jun 24, 2010 at 6:03 PM, <bleung@chromium.org> wrote:

> <nastygram from Build Sheriff>
>
> Cleaning up /usr/local symlinks for
>
>
/home/chrome-bot/trunk/src/build/images/x86-generic/0.7.49.0-a1/stateful_partition/dev_image
> /home/chrome-bot/trunk/src/scripts/chromeos-common.sh: line 252:
> FLAGS_recovery:
> unbound variable
> An error occurred in your build so your latest output directory is invalid.
>
> Build is broken. Can you fix quickly, otherwise we'll revert.
>
>
> http://codereview.chromium.org/2813029/show
>

[Benson Leung, 2010-06-25 01:19:55]

Actually, disregard. It looks like since you broke up the build image and
chromeos-common changes, one of the build bots picked up half of your changes
only. Should cycle green now that all of the bots have resynced with all of your
changes.

[Tan Gao, 2010-06-25 03:11:55]

Hi guys,

I checked in a bunch of CLs that reworked the recovery installer bits
in several different git repos. I don't know if there's a way to check
in all of them in a single CL (hence the slew of CLs). Unfortunately,
the buildbot picks in the middle of the run and broke :-(

If anyone has recommendation on how to make changes to multiple git
repos in ONE CL, I'd certainly love to upgrade my dev flow

Thanks!
Tan

On Thu, Jun 24, 2010 at 6:19 PM,  <bleung@chromium.org> wrote:
> Actually, disregard. It looks like since you broke up the build image and
> chromeos-common changes, one of the build bots picked up half of your
> changes
> only. Should cycle green now that all of the bots have resynced with all of
> your
> changes.
>
> http://codereview.chromium.org/2813029/show
>

[piman, 2010-06-27 22:09:56]

On Thu, Jun 24, 2010 at 8:11 PM, Tan Gao <tgao@chromium.org> wrote:

> Hi guys,
>
> I checked in a bunch of CLs that reworked the recovery installer bits
> in several different git repos. I don't know if there's a way to check
> in all of them in a single CL (hence the slew of CLs). Unfortunately,
> the buildbot picks in the middle of the run and broke :-(
>
> If anyone has recommendation on how to make changes to multiple git
> repos in ONE CL, I'd certainly love to upgrade my dev flow
>
> Thanks!
> Tan
>

In a nutshell, you can't.

What you can do though, is try to submit all of them within a small
timeframe (i.e. wait for all the lgtms and then submit all of them), and you
should also start with the ones that can be submitted independently of the
others (but are needed by the other ones), like the ones that remove uses of
flags before the ones that remove the flags.

HTH
Antoine


> On Thu, Jun 24, 2010 at 6:19 PM,  <bleung@chromium.org> wrote:
> > Actually, disregard. It looks like since you broke up the build image and
> > chromeos-common changes, one of the build bots picked up half of your
> > changes
> > only. Should cycle green now that all of the bots have resynced with all
> of
> > your
> > changes.
> >
> > http://codereview.chromium.org/2813029/show
> >
>

[piman, 2010-06-27 22:12:17]

On Sun, Jun 27, 2010 at 3:09 PM, Antoine Labour <piman@chromium.org> wrote:

>
>
> On Thu, Jun 24, 2010 at 8:11 PM, Tan Gao <tgao@chromium.org> wrote:
>
>> Hi guys,
>>
>> I checked in a bunch of CLs that reworked the recovery installer bits
>> in several different git repos. I don't know if there's a way to check
>> in all of them in a single CL (hence the slew of CLs). Unfortunately,
>> the buildbot picks in the middle of the run and broke :-(
>>
>> If anyone has recommendation on how to make changes to multiple git
>> repos in ONE CL, I'd certainly love to upgrade my dev flow
>>
>> Thanks!
>> Tan
>>
>
> In a nutshell, you can't.
>
> What you can do though, is try to submit all of them within a small
> timeframe (i.e. wait for all the lgtms and then submit all of them), and you
> should also start with the ones that can be submitted independently of the
> others (but are needed by the other ones), like the ones that remove uses of
> flags before the ones that remove the flags.
>
> HTH
> Antoine
>

Also, it'd be useful to give the sheriffs a heads up, and stay available
after submitting them so that we don't spend time second-guessing the
intent. When you submit several CLs that all seem inter-dependent, if we
need to revert one we need to revert many, there's extra risk of missing one
etc.

Antoine


>
>> On Thu, Jun 24, 2010 at 6:19 PM,  <bleung@chromium.org> wrote:
>> > Actually, disregard. It looks like since you broke up the build image
>> and
>> > chromeos-common changes, one of the build bots picked up half of your
>> > changes
>> > only. Should cycle green now that all of the bots have resynced with all
>> of
>> > your
>> > changes.
>> >
>> > http://codereview.chromium.org/2813029/show
>> >
>>
>
>

[Tan Gao, 2010-06-28 14:54:20]

Thanks Antione for the tips! I'll keep it in mind

To notify the sheriff on duty, is this the best URL to look up sheriffs?
http://buildbot.jail.google.com/buildbot/chromeos/waterfall

Tan

On Sun, Jun 27, 2010 at 3:11 PM, Antoine Labour <piman@chromium.org> wrote:

>
>
> On Sun, Jun 27, 2010 at 3:09 PM, Antoine Labour <piman@chromium.org>wrote:
>
>>
>> In a nutshell, you can't.
>>
>> What you can do though, is try to submit all of them within a small
>> timeframe (i.e. wait for all the lgtms and then submit all of them), and you
>> should also start with the ones that can be submitted independently of the
>> others (but are needed by the other ones), like the ones that remove uses of
>> flags before the ones that remove the flags.
>>
>> HTH
>> Antoine
>>
>
> Also, it'd be useful to give the sheriffs a heads up, and stay available
> after submitting them so that we don't spend time second-guessing the
> intent. When you submit several CLs that all seem inter-dependent, if we
> need to revert one we need to revert many, there's extra risk of missing one
> etc.
>
> Antoine
>