New issue
Advanced search Search tips

Issue 805569 link

Starred by 0 users

Issue metadata

Status: Fixed
Owner:
Closed: Feb 2018
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Task



Sign in to add a comment

delete CROS_WORKON_SUBDIR support

Project Member Reported by vapier@chromium.org, Jan 24 2018

Issue description

this unnecessarily complicates the cros-workon code.  it comes from a time where we would check out projects not to src/third_party/xxx/.git but to src/third_party/xxx/files/.git and then try to avoid having to set up CROS_WORKON_LOCALNAME to ${PN}/files.

at this point, only two projects are left that do this (autotest & u-boot), so lets convert these to set CROS_WORKON_LOCALNAME directly so we can delete CROS_WORKON_SUBDIR entirely.
 
Project Member

Comment 1 by bugdroid1@chromium.org, Jan 25 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/312f8a6ab60ab9269baab994fbc24b917b2a98e6

commit 312f8a6ab60ab9269baab994fbc24b917b2a98e6
Author: Mike Frysinger <vapier@chromium.org>
Date: Thu Jan 25 08:15:53 2018

patman: stop using CROS_WORKON_SUBDIR

Point it to the local u-boot checkout directly.  This will let us
delete this cros-workon variable from the whole tree.

BUG= chromium:805569 
TEST=patman still emerges

Change-Id: I258d7d33011a1e0536d0bfba2e7a370f2aa799d8
Reviewed-on: https://chromium-review.googlesource.com/884341
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>

[modify] https://crrev.com/312f8a6ab60ab9269baab994fbc24b917b2a98e6/dev-vcs/patman/patman-9999.ebuild

Project Member

Comment 2 by bugdroid1@chromium.org, Jan 25 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/cfda72db42361e01794257b88b796d3cfe6fd463

commit cfda72db42361e01794257b88b796d3cfe6fd463
Author: Mike Frysinger <vapier@chromium.org>
Date: Thu Jan 25 10:43:20 2018

chromeos-u-boot: stop using CROS_WORKON_SUBDIR

Point it to the local u-boot checkout directly.  This will let us
delete this cros-workon variable from the whole tree.

BUG= chromium:805569 
TEST=precq passes

Change-Id: Icbee4ca7cf7e99ba4355ab12b319ac04faf16199
Reviewed-on: https://chromium-review.googlesource.com/883731
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Shuhei Takahashi <nya@chromium.org>

[modify] https://crrev.com/cfda72db42361e01794257b88b796d3cfe6fd463/sys-boot/chromeos-u-boot/chromeos-u-boot-9999.ebuild

Project Member

Comment 3 by bugdroid1@chromium.org, Jan 26 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/3672b6a6fb293388aabca23448fd7f35c094382d

commit 3672b6a6fb293388aabca23448fd7f35c094382d
Author: Mike Frysinger <vapier@chromium.org>
Date: Fri Jan 26 03:23:49 2018

cypress-tools: drop redundant CROS_WORKON_SUBDIR

The default is already the empty string, so no need to specify it
manually here.

BUG= chromium:805569 
TEST=precq passes

Change-Id: Id5801b41ef03785e21d18e4558efd530d3635598
Reviewed-on: https://chromium-review.googlesource.com/883730
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>
Reviewed-by: Shuhei Takahashi <nya@chromium.org>

[modify] https://crrev.com/3672b6a6fb293388aabca23448fd7f35c094382d/chromeos-base/cypress-tools/cypress-tools-9999.ebuild

Project Member

Comment 4 by bugdroid1@chromium.org, Jan 28 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/a77daf0a1e3a72ce5532f914665c57454694ea1a

commit a77daf0a1e3a72ce5532f914665c57454694ea1a
Author: Mike Frysinger <vapier@chromium.org>
Date: Sun Jan 28 07:51:40 2018

autotest: stop using CROS_WORKON_SUBDIR

Point it to the local autotest checkout directly.  This will let us
delete this cros-workon variable from the whole tree.

BUG= chromium:805569 
TEST=precq passes

Change-Id: I419392352f09787c4b7e7cd91557281453d1a880
Reviewed-on: https://chromium-review.googlesource.com/890362
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>

[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-ownershipapi/autotest-tests-ownershipapi-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-p2p/autotest-tests-p2p-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-ltp/autotest-tests-ltp-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-peerd/autotest-tests-peerd-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-webgl-perf/autotest-deps-webgl-perf-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-web-frontend/autotest-web-frontend-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-server-tests-telemetry/autotest-server-tests-telemetry-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-cros-disks/autotest-tests-cros-disks-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-server-tests/autotest-server-tests-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-power/autotest-tests-power-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-server-tests-shill/autotest-server-tests-shill-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-cellular/autotest-tests-cellular-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-webgl-clear/autotest-deps-webgl-clear-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests/autotest-tests-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-server/autotest-server-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-wifi-bootstrapping/autotest-tests-wifi-bootstrapping-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest/autotest-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-graphics/autotest-tests-graphics-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-chrome/autotest-chrome-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-server-tests-bluetooth/autotest-server-tests-bluetooth-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-tpm/autotest-tests-tpm-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-security/autotest-tests-security-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-cryptohome/autotest-tests-cryptohome-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps/autotest-deps-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-touchpad/autotest-tests-touchpad-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-glbench/autotest-deps-glbench-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-shill/autotest-tests-shill-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-cloud-services/autotest-tests-cloud-services-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-tests-audio/autotest-tests-audio-9999.ebuild
[modify] https://crrev.com/a77daf0a1e3a72ce5532f914665c57454694ea1a/chromeos-base/autotest-deps-ltp/autotest-deps-ltp-9999.ebuild

Project Member

Comment 5 by bugdroid1@chromium.org, Jan 31 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/board-overlays/+/8c30131191ca2510b30105a3a39d5620b8dab9f4

commit 8c30131191ca2510b30105a3a39d5620b8dab9f4
Author: Mike Frysinger <vapier@chromium.org>
Date: Wed Jan 31 08:53:56 2018

guado: stop using CROS_WORKON_SUBDIR

Point it to the local autotest checkout directly.  This will let us
delete this cros-workon variable from the whole tree.

BUG= chromium:805569 
TEST=precq passes

Change-Id: Ie051bc74e8442e2990b7203198d86c522699e8f9
Reviewed-on: https://chromium-review.googlesource.com/894223
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Ege Mihmanli <egemih@google.com>

[modify] https://crrev.com/8c30131191ca2510b30105a3a39d5620b8dab9f4/overlay-guado/chromeos-base/autotest-tests-guado/autotest-tests-guado-9999.ebuild

Project Member

Comment 6 by bugdroid1@chromium.org, Jan 31 2018

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chromeos/overlays/chromeos-overlay/+/fab335caae4256b82e99dc907149313690dbc118

commit fab335caae4256b82e99dc907149313690dbc118
Author: Mike Frysinger <vapier@chromium.org>
Date: Wed Jan 31 11:36:26 2018

Project Member

Comment 7 by bugdroid1@chromium.org, Jan 31 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/1c49eab5a8a5be9bd343fb7fc7e399540211f379

commit 1c49eab5a8a5be9bd343fb7fc7e399540211f379
Author: Mike Frysinger <vapier@chromium.org>
Date: Wed Jan 31 19:14:02 2018

cros-workon: drop CROS_WORKON_SUBDIR entirely

Now that no ebuilds are using this anymore, blacklist it explicitly
to avoid any future usage showing up by accident.

BUG= chromium:805569 
TEST=precq passes

Change-Id: I89f33084a125ea1ee47d7ad4f8e82deeba30774f
Reviewed-on: https://chromium-review.googlesource.com/894151
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[modify] https://crrev.com/1c49eab5a8a5be9bd343fb7fc7e399540211f379/chromeos-base/autotest-private-all/autotest-private-all-0.0.1.ebuild
[modify] https://crrev.com/1c49eab5a8a5be9bd343fb7fc7e399540211f379/eclass/cros-workon.eclass

Project Member

Comment 8 by bugdroid1@chromium.org, Feb 1 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/3119a47ff011055bcc821aeb03a14607f7dc49f9

commit 3119a47ff011055bcc821aeb03a14607f7dc49f9
Author: Mike Frysinger <vapier@chromium.org>
Date: Thu Feb 01 10:42:02 2018

portage_util: drop CROS_WORKON_SUBDIR

We've dropped this from ebuilds/eclasses, so drop support for it.

BUG= chromium:805569 
TEST=precq passes

Change-Id: I0524814658a8424ff6e73758dfeb6e8d04b9e0b9
Reviewed-on: https://chromium-review.googlesource.com/886063
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Shuhei Takahashi <nya@chromium.org>

[modify] https://crrev.com/3119a47ff011055bcc821aeb03a14607f7dc49f9/lib/portage_util_unittest.py
[modify] https://crrev.com/3119a47ff011055bcc821aeb03a14607f7dc49f9/lib/portage_util.py

Status: Fixed (was: Available)
code is out and being blocked in new ebuilds (and seems to have caught at least one new CL so far so that's good)

Sign in to add a comment