Lann, here's a platform2 bug

Is there documentation on what it means to migrate to platform2?

kerrnel@ is out this week so you might not want to go ahead with this just yet.

it involves manually rewriting git history and doing merges.  if you aren't confident in git, this might not be a useful bug for you ;).

If it's just filter-branch and packaging updates with no other code changes that should be fine. 

basically.  we make it look like all imageloader commits happened under an imageloader/ dir, then we do a merge in the platform2 repo to stitch its history in, then someone (anyone) pushes that to their sandbox in that repo for manual review, then someone (me?) does a manual push to master.

then we update the ebuilds.

Documenting the first few steps:

# platform/imageloader
git filter-branch --index-filter rehome.sh HEAD

# rehome.sh
git ls-files -s | sed "s-\t\"*-&imageloader/-" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info
if [ -f "$GIT_INDEX_FILE.new" ]; then mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"; fi

# platform2
git fetch ../platform/imageloader
git merge --allow-unrelated-histories FETCH_HEAD
git push cros HEAD:refs/sandbox/lannm/merge-imageloader


The rewritten branch is available in platform2 refs/sandbox/lannm/merge-imageloader

vapier@: feel free to reassign if there is someone else who can review & push to master.

Hi, has this happened? If not, what permissions does Lann need to set it up?

i've refreshed lannm's work.  looking at the open CL list, seems like dev has quieted down again, so doing the migration now would work.

https://chromium-review.googlesource.com/q/project:chromiumos%252Fplatform%252Fimageloader+status:open

any last comments before i pull the trigger ?

Was the trigger pulled?

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

commit 76b4b4c62e056aeacfc4911586e29d233f848f62
Author: Mike Frysinger <vapier@chromium.org>
Date: Fri Dec 01 22:54:45 2017

imageloader: import to platform2

BUG= chromium:704720 
TEST=build passes

Change-Id: Ie19a0373e0e39646f76ebf99c1a81083f25efdc6
Reviewed-on: https://chromium-review.googlesource.com/803841
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Greg Kerr <kerrnel@chromium.org>
Reviewed-by: Xiaochu Liu <xiaochu@chromium.org>

[modify] https://crrev.com/76b4b4c62e056aeacfc4911586e29d233f848f62/chromeos-base/imageloader/imageloader-9999.ebuild

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/7eb1df372c6584ffbd3266436a53fca2ad8455c7

commit 7eb1df372c6584ffbd3266436a53fca2ad8455c7
Author: Mike Frysinger <vapier@chromium.org>
Date: Sat Dec 02 01:57:52 2017

imageloader: document new imageloader import

BUG= chromium:704720 
TEST=precq passes

Change-Id: I7105a150ef57b2d41b151a422cf5e8c2e541dc28
Reviewed-on: https://chromium-review.googlesource.com/803842
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Greg Kerr <kerrnel@chromium.org>

[modify] https://crrev.com/7eb1df372c6584ffbd3266436a53fca2ad8455c7/imageloader/README.md
[modify] https://crrev.com/7eb1df372c6584ffbd3266436a53fca2ad8455c7/README.md

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

commit 37a4a5bfd77f015dacc67f004794960c9fa58d17
Author: Mike Frysinger <vapier@chromium.org>
Date: Tue Dec 05 04:02:54 2017

imageloader-client: import to platform2

BUG= chromium:704720 
TEST=build passes

Change-Id: I619484a25d5d1c0bae02e8c3cf71bf396865b0ce
Reviewed-on: https://chromium-review.googlesource.com/804756
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Greg Kerr <kerrnel@chromium.org>

[modify] https://crrev.com/37a4a5bfd77f015dacc67f004794960c9fa58d17/chromeos-base/imageloader-client/imageloader-client-9999.ebuild

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/62c7ecf007b1775ee68988c8488753c365269a52

commit 62c7ecf007b1775ee68988c8488753c365269a52
Author: Mike Frysinger <vapier@chromium.org>
Date: Sat Dec 16 11:00:45 2017

common-mk: export SRC so tests can access data files directly

Currently we force tests to copy any inputs they need for tests to the
output directly.  This is a bit wasteful, especially if the inputs are
a bit on the larger side, so set up the canonical SRC variable (that is
pointing to the source tree) for tests to access.

BUG= chromium:704720 
TEST=precq passes, as does new imageloader tests
CQ-DEPEND=CL:830215

Change-Id: Id196f4b0d51e11014907aae1fa7677e564038839
Reviewed-on: https://chromium-review.googlesource.com/830195
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>

[modify] https://crrev.com/62c7ecf007b1775ee68988c8488753c365269a52/common-mk/platform2_test.py

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/0b1648907bb376accf95f9662f843b0ec5c4e1ab

commit 0b1648907bb376accf95f9662f843b0ec5c4e1ab
Author: Mike Frysinger <vapier@chromium.org>
Date: Sat Dec 16 11:00:46 2017

imageloader: fix unittest data file lookup

These tests have been incorrectly reading from the repo checkout all
the time instead of the local source/build dir.  Fix it to use the
local copy which matches the source.

BUG= chromium:704720 
TEST=precq passes

Change-Id: I49c8f616c3159afaeada05082164e670f72bd0ba
Reviewed-on: https://chromium-review.googlesource.com/830196
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>

[modify] https://crrev.com/0b1648907bb376accf95f9662f843b0ec5c4e1ab/imageloader/test_utilities.cc

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

commit df201892fa0f4348b8aa4e0d8adc4ae79ddf9056
Author: Mike Frysinger <vapier@chromium.org>
Date: Sat Dec 16 11:00:46 2017

cros-workon: export SRC for unittests

This way unittests can access their data files more easily.

BUG= chromium:704720 
TEST=precq passes

Change-Id: Id45d73dd3aa1512463539958d23b12b546aa6618
Reviewed-on: https://chromium-review.googlesource.com/830215
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>

[modify] https://crrev.com/df201892fa0f4348b8aa4e0d8adc4ae79ddf9056/eclass/platform.eclass

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chromeos/manifest-internal/+/dda7f2cb1dc9de2f9254dae7369617c0d6a32b7d

commit dda7f2cb1dc9de2f9254dae7369617c0d6a32b7d
Author: Mike Frysinger <vapier@chromium.org>
Date: Sun Dec 17 04:40:16 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/manifest/+/38b2c3ae34c253b6ac5b30023c339d45c8a291a1

commit 38b2c3ae34c253b6ac5b30023c339d45c8a291a1
Author: Mike Frysinger <vapier@chromium.org>
Date: Sun Dec 17 04:40:17 2017

imageloader: move to platform2

This is part of platform2 now, so don't need the sep repo anymore.

BUG= chromium:704720 
TEST=build passes

Change-Id: Ie05bd41bfb4f10d7c29e75d73fda359a1b2d38ea
Reviewed-on: https://chromium-review.googlesource.com/804074
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Greg Kerr <kerrnel@chromium.org>

[modify] https://crrev.com/38b2c3ae34c253b6ac5b30023c339d45c8a291a1/full.xml