New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 810784 link

Starred by 2 users

Issue metadata

Status: Started
Owner:
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 1
Type: Bug

Blocked on:
issue 810874



Sign in to add a comment

eve factory: ec_utils broken

Project Member Reported by gwendal@chromium.org, Feb 9 2018

Issue description

ec-utils-9999: make: *** No rule to make target 'gsctool'.  Stop.

I am guessing not all changes related to usb_updater change to gsctool have been cherry-picked. (b:67007500)

Needed for b:73122727
 
chromeos-base:ec-utils-9999:20180209-165933.log
2.7 KB View Download


Looks like this is missing in the eve factory branch https://chromium-review.googlesource.com/709738

Blockedon: 810874
Project Member

Comment 3 by bugdroid1@chromium.org, Feb 9 2018

Labels: merge-merged-factory-eve-9667.B
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform/ec/+/87d50d265d98f3e1f483e2e62b83639e752dd7fb

commit 87d50d265d98f3e1f483e2e62b83639e752dd7fb
Author: Vadim Bendebury <vbendeb@chromium.org>
Date: Fri Feb 09 20:36:07 2018

g: rename usb_updater into gsctool

The usb_updater utility has long been not just an updater, and has
long been using other interfaces in addition to USB. gsctool is a much
more suitable name.

CQ-DEPEND=CL:709776
BRANCH=cr50,eve
BUG=b:67007500,chromium:810784
TEST=verified that make -C ./extra/usb_updater generates
     ./extra/usb_updater/gsctool:

  $ ./extra/usb_updater/gsctool --help

  Usage: gsctool [options] <binary image>

  This updates the Cr50 RW firmware over USB.
  The required argument is the full RO+RW image.

  Options:
  [...]
  $

TEST=emerge-eve works in factory branch after revert.

Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/709738
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
(cherry picked from commit a08f61506cc71b690858e51da905c7dcb2d7ef10)
Conflicts: Accept all changes in util/signer/create_released_image.sh
Change-Id: I3ab70c28acf3664ddefaa923a87ba1fd5c3c437b
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/894342

[modify] https://crrev.com/87d50d265d98f3e1f483e2e62b83639e752dd7fb/extra/usb_updater/.gitignore
[modify] https://crrev.com/87d50d265d98f3e1f483e2e62b83639e752dd7fb/util/signer/create_released_image.sh
[modify] https://crrev.com/87d50d265d98f3e1f483e2e62b83639e752dd7fb/include/rwsig.h
[modify] https://crrev.com/87d50d265d98f3e1f483e2e62b83639e752dd7fb/extra/usb_updater/Makefile
[modify] https://crrev.com/87d50d265d98f3e1f483e2e62b83639e752dd7fb/extra/usb_updater/usb_updater2.c
[rename] https://crrev.com/87d50d265d98f3e1f483e2e62b83639e752dd7fb/extra/usb_updater/gsctool.c
[modify] https://crrev.com/87d50d265d98f3e1f483e2e62b83639e752dd7fb/include/tpm_vendor_cmds.h

Project Member

Comment 4 by bugdroid1@chromium.org, Feb 14 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform/ec/+/37922196b6d0c17ba2ef5be1ecd90c8adf89fb18

commit 37922196b6d0c17ba2ef5be1ecd90c8adf89fb18
Author: Sam Hurst <shurst@google.com>
Date: Wed Feb 14 19:16:23 2018

Revert "g: rename usb_updater into gsctool"

This reverts commit 87d50d265d98f3e1f483e2e62b83639e752dd7fb.

Reason for revert: The sequence of the patches are not correct. Revert to correct the sequence.

Original change's description:
> g: rename usb_updater into gsctool
> 
> The usb_updater utility has long been not just an updater, and has
> long been using other interfaces in addition to USB. gsctool is a much
> more suitable name.
> 
> CQ-DEPEND=CL:709776
> BRANCH=cr50,eve
> BUG=b:67007500,chromium:810784
> TEST=verified that make -C ./extra/usb_updater generates
>      ./extra/usb_updater/gsctool:
> 
>   $ ./extra/usb_updater/gsctool --help
> 
>   Usage: gsctool [options] <binary image>
> 
>   This updates the Cr50 RW firmware over USB.
>   The required argument is the full RO+RW image.
> 
>   Options:
>   [...]
>   $
> 
> TEST=emerge-eve works in factory branch after revert.
> 
> Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/709738
> Reviewed-by: Mary Ruthven <mruthven@chromium.org>
> (cherry picked from commit a08f61506cc71b690858e51da905c7dcb2d7ef10)
> Conflicts: Accept all changes in util/signer/create_released_image.sh
> Change-Id: I3ab70c28acf3664ddefaa923a87ba1fd5c3c437b
> Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/894342

Bug: b:67007500, chromium:810784
Change-Id: Ie978398ef7ea5ffe41d1971203541c17e732e3b6
Reviewed-on: https://chromium-review.googlesource.com/919562
Reviewed-by: YH Lin <yueherngl@chromium.org>
Commit-Queue: Sam Hurst <shurst@google.com>
Tested-by: Sam Hurst <shurst@google.com>

[modify] https://crrev.com/37922196b6d0c17ba2ef5be1ecd90c8adf89fb18/extra/usb_updater/.gitignore
[modify] https://crrev.com/37922196b6d0c17ba2ef5be1ecd90c8adf89fb18/util/signer/create_released_image.sh
[rename] https://crrev.com/37922196b6d0c17ba2ef5be1ecd90c8adf89fb18/extra/usb_updater/usb_updater.c
[modify] https://crrev.com/37922196b6d0c17ba2ef5be1ecd90c8adf89fb18/include/rwsig.h
[modify] https://crrev.com/37922196b6d0c17ba2ef5be1ecd90c8adf89fb18/extra/usb_updater/Makefile
[modify] https://crrev.com/37922196b6d0c17ba2ef5be1ecd90c8adf89fb18/extra/usb_updater/usb_updater2.c
[modify] https://crrev.com/37922196b6d0c17ba2ef5be1ecd90c8adf89fb18/include/tpm_vendor_cmds.h

Project Member

Comment 5 by bugdroid1@chromium.org, Feb 14 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform/ec/+/2bb88ff9a16867e1ed9e69d60f171eccced45ddb

commit 2bb88ff9a16867e1ed9e69d60f171eccced45ddb
Author: Sam Hurst <shurst@google.com>
Date: Wed Feb 14 21:35:09 2018

Revert "Revert "g: rename usb_updater into gsctool""

This reverts commit 37922196b6d0c17ba2ef5be1ecd90c8adf89fb18.

Reason for revert: Revert the previous revert to correct the patch sequence.

Original change's description:
> Revert "g: rename usb_updater into gsctool"
> 
> This reverts commit 87d50d265d98f3e1f483e2e62b83639e752dd7fb.
> 
> Reason for revert: The sequence of the patches are not correct. Revert to correct the sequence.
> 
> Original change's description:
> > g: rename usb_updater into gsctool
> > 
> > The usb_updater utility has long been not just an updater, and has
> > long been using other interfaces in addition to USB. gsctool is a much
> > more suitable name.
> > 
> > CQ-DEPEND=CL:709776
> > BRANCH=cr50,eve
> > BUG=b:67007500,chromium:810784
> > TEST=verified that make -C ./extra/usb_updater generates
> >      ./extra/usb_updater/gsctool:
> > 
> >   $ ./extra/usb_updater/gsctool --help
> > 
> >   Usage: gsctool [options] <binary image>
> > 
> >   This updates the Cr50 RW firmware over USB.
> >   The required argument is the full RO+RW image.
> > 
> >   Options:
> >   [...]
> >   $
> > 
> > TEST=emerge-eve works in factory branch after revert.
> > 
> > Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
> > Reviewed-on: https://chromium-review.googlesource.com/709738
> > Reviewed-by: Mary Ruthven <mruthven@chromium.org>
> > (cherry picked from commit a08f61506cc71b690858e51da905c7dcb2d7ef10)
> > Conflicts: Accept all changes in util/signer/create_released_image.sh
> > Change-Id: I3ab70c28acf3664ddefaa923a87ba1fd5c3c437b
> > Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
> > Reviewed-on: https://chromium-review.googlesource.com/894342
> 
> Bug: b:67007500, chromium:810784
> Change-Id: Ie978398ef7ea5ffe41d1971203541c17e732e3b6
> Reviewed-on: https://chromium-review.googlesource.com/919562
> Reviewed-by: YH Lin <yueherngl@chromium.org>
> Commit-Queue: Sam Hurst <shurst@google.com>
> Tested-by: Sam Hurst <shurst@google.com>

Bug: b:67007500, chromium:810784
Change-Id: I68ea78f8247857bbb041bf20343deea306de3272
Reviewed-on: https://chromium-review.googlesource.com/919563
Reviewed-by: YH Lin <yueherngl@chromium.org>
Tested-by: Sam Hurst <shurst@google.com>
Commit-Queue: Sam Hurst <shurst@google.com>

[modify] https://crrev.com/2bb88ff9a16867e1ed9e69d60f171eccced45ddb/extra/usb_updater/.gitignore
[modify] https://crrev.com/2bb88ff9a16867e1ed9e69d60f171eccced45ddb/util/signer/create_released_image.sh
[modify] https://crrev.com/2bb88ff9a16867e1ed9e69d60f171eccced45ddb/include/rwsig.h
[modify] https://crrev.com/2bb88ff9a16867e1ed9e69d60f171eccced45ddb/extra/usb_updater/Makefile
[modify] https://crrev.com/2bb88ff9a16867e1ed9e69d60f171eccced45ddb/extra/usb_updater/usb_updater2.c
[rename] https://crrev.com/2bb88ff9a16867e1ed9e69d60f171eccced45ddb/extra/usb_updater/gsctool.c
[modify] https://crrev.com/2bb88ff9a16867e1ed9e69d60f171eccced45ddb/include/tpm_vendor_cmds.h

Owner: vbendeb@chromium.org
Status: Started (was: Untriaged)
Cc: vbendeb@chromium.org
Owner: shurst@google.com
I have no idea who is cherry picking what and why into eve factory branch. Looks like Sam is doing it?

Sign in to add a comment