Update AOSP->CrOS mirroring rules for specific git repos |
||
Issue descriptionSee crbug.com/549699 for previous context on this setup. We are forking some AOSP repos from CrOS that are currently mirrored from AOSP to CrOS. The referenced bug requested the following list of repos to be created in CrOS gerrit instance with a aosp/master -> cros/master mirror setup: aosp/platform/external/dbus-binding-generator aosp/platform/external/libchrome aosp/platform/external/libchromeos aosp/platform/external/minijail aosp/platform/external/modp_b64 aosp/platform/hardware/libhardware aosp/platform/system/attestation aosp/platform/system/bt aosp/platform/system/connectivity/apmanager aosp/platform/system/connectivity/shill aosp/platform/system/core aosp/platform/system/firewalld aosp/platform/system/tpm_manager aosp/platform/system/trunks aosp/platform/system/update_engine aosp/platform/system/webservd The request now are the following: 1. Create some more missing repos: 1.a. Create the following repos in the chromium gerrit instance: aosp/platform/external/libbrillo aosp/platform/system/tpm 1.b Initialize the master branch on them with a one-time push from AOSP/master equivalent repo (not active mirroring of master, see below why). The corresponding AOSP repo is the same name but removing the "aosp/" prefix from the path. 1.c. Allow developers to upload CLs to these two repos for review, like any other chromium repo. 2. Stop mirroring master to master. 2.a. stop the aosp/master -> cros/master mirroring requested in the referenced bug and leave cros/master with whatever it has today (we will take care of the ToT in cros manually from now on). aosp/platform/external/dbus-binding-generator aosp/platform/external/libchrome aosp/platform/external/libchromeos aosp/platform/external/minijail aosp/platform/external/modp_b64 aosp/platform/hardware/libhardware aosp/platform/system/attestation aosp/platform/system/bt aosp/platform/system/connectivity/apmanager aosp/platform/system/connectivity/shill aosp/platform/system/core aosp/platform/system/firewalld aosp/platform/system/tpm_manager aosp/platform/system/trunks aosp/platform/system/update_engine aosp/platform/system/webservd 2.b. Change ACLs to allow developers to upload CLs to cros/master for review, as any other normal chromium repository on all those. 3. Dead repos. This list of repos in the chromium gerrit instance are deprecated/dead (replaced by the two repos created in step 1). Mark them as DEAD if you want. This step is optional. aosp/platform/external/libchromeos aosp/platform/system/tpm_manager aosp/platform/system/trunks aosp/platform/system/attestation 4. Mirroring to "upstream" branch. 4.a To facilitate sharing CLs from AOSP to CrOS on a case-by-case basis after the fork, we would like to setup mirroring of aosp/master to a new cros/upstream branch on the following repos: aosp/platform/external/libbrillo aosp/platform/system/tpm aosp/platform/external/dbus-binding-generator aosp/platform/external/libchrome aosp/platform/external/minijail aosp/platform/system/connectivity/apmanager aosp/platform/system/connectivity/shill aosp/platform/system/firewalld aosp/platform/system/update_engine aosp/platform/system/webservd aosp/platform/system/core aosp/platform/external/modp_b64 (Note: I intentionally left system/bt and hardware/libhardware out of this list). This would be similar to the aosp/master to cros/master mirroring I asked you to cancel in step 2, but to cros/upstream (and also on a different list of repos). Please let me know if this imposes a problem. 4.b. If possible, change ACLs on the new cros/upstream branch so developers can't upload or land CLs on that branch only. --- None of the repos in this bug have an impact in current CrOS builds, so there's no risk on breaking that build (ebuilds have pinned hashes). I discussed this setup with dgarrett@ today (cc'd) and he thinks is reasonable. Thanks in advance for executing this!
,
May 6 2016
I think it was going to be easier for this bug to be done altogether for the same person, but if you want this to be split in smaller bugs I can copy-paste that for you.
,
May 13 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/95eb890655de64cbff74eeb0e8297471074f8643 commit 95eb890655de64cbff74eeb0e8297471074f8643 Author: Alex Deymo <deymo@chromium.org> Date: Fri May 13 03:32:51 2016 Uprev all AOSP ebuilds to the version in Chromium OS. The chromium gerrit instance copy of these repos is not getting automatic mirroring of the aosp repos anymore. This CL uprevs all the ebuilds to the version in the chromium gerrit repos, without switching the source. This is in preparation to switch the build source to the chromium copies without introducing code changes while doing that. Marking the following ebuilds as stable: * chromeos-base/apmanager * chromeos-base/attestation * chromeos-base/chromeos-dbus-bindings * chromeos-base/chromeos-minijail * chromeos-base/firewalld * chromeos-base/libbrillo * chromeos-base/shill * chromeos-base/shill-client * chromeos-base/shill-test-scripts * chromeos-base/tpm_manager * chromeos-base/trunks * chromeos-base/update_engine * chromeos-base/update_engine-client * chromeos-base/webserver Pulled 1 new changes from platform/external/dbus-binding-generator: (ebuild: chromeos-base/chromeos-dbus-bindings) bce0483 Don't generate code with unused private fields Pulled 4 new changes from platform/external/libbrillo: (ebuild: chromeos-base/libbrillo) ae40d5e Disable SimpleProcess.BindFdToSameFd test. ed104e9 libbrillo: Add curl_multi_perform, curl_multi_wait wrappers. 8c0f192 libbrillo: Remove release/aquire semantic from scoped_ptr/unique_ptr 476d59a Fix Process::BindFd when passing the same fd to the child. Pulled 3 new changes from platform/external/minijail: (ebuild: chromeos-base/chromeos-minijail) 7a56907 Avoid warning about BSD_SOURCE on glibc >= 2.20 9e35c09 Fix #ifdef statement. 2413f37 Skip setting seccomp filter when running with ASan. Pulled 23 new changes from platform/system/connectivity/shill: 49f7411 Fix cellular_service_unittest.cc in Chromium OS. 94ecc4a shill: add BinderService for each BinderAdaptor 7fa0def shill: implement IService Binder interface methods c8758fd shill: make brillo::BinderWatcher a member of shill::BinderControl 66d6016 shill: Provide reason string to Service::UserInitiatedConnect and ...Service::UserInitiatedDisconnect 572b6fe shill: update error types in IService Binder interface fe01898 shill: implement IManager Binder interface methods d0c457e Use libgtest_prod. 1d90758 shill: store BinderAdaptor pointers instead of Binder references ...in BinderControl The following patches were included in the shill ebuild, but not in shill-test-scripts and shill-client. 2f8fcfe shill: don't process proxy packet after read error d966a84 Revert "shill: distinguish between success and unknown failure" 954cb14 shill: distinguish between success and unknown failure c0bfc39 shill: Adding mpp, mpath messages for mesh stats. 1262e96 shill: collect more complete DHCPv6 configuration 27a206f Remove defunct members of WiFi class 30039ff shill: Add MAC address randomization property ad9c9c1 shill: Remove progressive scan 6642e97 Fix unused field errors 0b42fb4 shill_setup_wifi: Cleanup constants. 9cca259 shill_setup_wifi: Only exit once we're online. 202ed0d shill: improve handling of bridge interfaces f431d88 Fix IP collision detection in shill 625995a shill: update TODOs in ChromeosManagerDBusAdaptor Pulled 2 new changes from platform/system/firewalld: (ebuild: chromeos-base/firewalld) 3a84e4d Include header for DISALLOW_COPY_AND_ASSIGN 6bda44a Fix google-explicit-constructor warnings. Pulled 4 new changes from platform/system/tpm: d68cece Use libgtest_prod. 02058d7 Fix google-explicit-constructor warnings. dd09cb4 Include header for DISALLOW_COPY_AND_ASSIGN e3e7a3b Update MIPS policy Pulled 63 new changes from chromiumos/platform2: e040c6b libcontainer: Only use config in start 0f04499 installer: install MLO and u-boot.img if available dcb144c login: Add container config parser 4665df3 libchromeos-ui: Remove obsolete compositor flags. 036d370 power: Watch tablet mode switch. 7eb78c7 power: Support enabling keyboard backlight for user activity bcb822f power: Add check_powerd_config. 1145672 libcontainer: Add accessor methods for some config data 355d5e4 libcontainer: Add copy_minor param. 2149be9 libcontainer: Allow relative source when mounting externally 7427641 installer: Look for kernel partition in root device first. 6208a33 login_manager: systemd implementation for sync events. 2383e36 crash: Add systemd unit file for warn_collector 70f00b9 crash: Set signature of ARC ANRs to subject header 1f7c938 login: Fix clang-3.9 warnings 0aeaf2f login: Make ARC logs more verbose 63dd02a power: Add --keyboard to backlight_tool. 677075c power: Add --keyboard to get_powerd_initial_backlight_level. 7daf998 libcontainer: Move mounts to their own function 51fe387 libcontainer: Make config struct const in container 79ea1f0 cryptohome: Ensure cryptohome key during SetupTpm 8104e6b cros-disks: Add support for running without a session manager. 11252e2 crash: Fix unit test failures ce7194d crash: Update crash types d722958 libcontainer: Run setfiles after device creation 8d102cd login: Enable JS console logging for rialto b355d37 libchromeos-ui: add ASAN_OPTIONS=detect_odr_violation=0 b435c68 libcontainer: check calloc in create cf745c5 libcontainer: handle EINTR from minijail_wait 9bdcc88 Revert "common-mk: Kill any auxiliary child processes after the child terminates." 6d53215 power: Turn on the backlight earlier during resume 90ed00f common-mk: Kill any auxiliary child processes after the child terminates. f388860 installer: fix editing mbr with util-linux >= 2.26 2bd9ea9 libcontainer: allows calling setfiles on external mounts f6a8dd5 crosh: network_diag should default to clients3.google.com 6a5eeb9 power: Remove --debug option for resume time measurement cde8b1c crosh: add network_diag hosts necessary for kiosk mode 601fc53 init: Add console-ramoops log into clobber-log. 6a4bc27 common-mk: Some style fixes for platform2_test.py ddeba19 vpn: Ensure child process is killed before exiting. b5da953 libchromeos-ui: Ensure the server process is killed before exiting. f3d0bc4 installer: assume unescaped quotes in grub.cfg 9a64c1a login: Do not try to allocate stack space. da78102 login: ui.conf - make directory for running containers 98e1516 Revert "common-mk: Kill any auxiliary child processes after the child terminates." c904149 crash: dump more data for i915 debug 4768669 crash: Collect Java crash logs from ARC ad8ac01 crash: Clean up user collector logging fd24e9b common-mk: Kill any auxiliary child processes after the child terminates. 16d3565 debugd: Add GetPerfOutputFd that returns perf data over a file descriptor 4c85df1 disk_updater: add kingston reformatting. 42df3c5 quipper: Output 40-byte perfized build ID strings 085d03b quipper: Move new protobuf includes to compat/proto.h 8aafdfc login: Add allow-data-roaming-by-default for rialto 1498b4e debugd: Close the FD after GetBigFeedbackLogs() to signal readers on the other end of the pipe. 7b63aa0 power: Add regex for suspend-to-idle to calculate metrics. 4d3b175 common-mk: protoc: Add the output directory to the include path. a87c8a5 init: use frecon to display low battery warning on freon images 309d1be crash: Collect console-ramoops for hardware watchdog resets 83c8370 crash: Split --init into --init and --boot_collect 75b9bfe power: Turn Off remote sync of clock during suspend stress test 8f1f983 dark_resume: do not write to state file when disabled fd87621 login: Add method GetArcStartTime() BUG= chromium:609385 TEST=trybots Change-Id: I4322650a9ec906e2cf4269977b88fb98e6d38851 Reviewed-on: https://chromium-review.googlesource.com/344361 Commit-Ready: Alex Deymo <deymo@chromium.org> Tested-by: Alex Deymo <deymo@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/update_engine/update_engine-0.0.3-r1899.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/trunks/trunks-0.0.1-r1195.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-0.0.1-r1080.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/tpm_manager/tpm_manager-0.0.1-r346.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/libbrillo/libbrillo-0.0.1-r22.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/attestation/attestation-0.0.1-r1064.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/shill-client/shill-client-0.0.1-r54.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/apmanager/apmanager-0.0.1-r1069.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/update_engine-client/update_engine-client-0.0.1-r39.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/shill/shill-0.0.3-r13.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/chromeos-minijail/chromeos-minijail-0.0.1-r1464.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/webserver/webserver-0.0.1-r681.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/shill-test-scripts/shill-test-scripts-0.0.1-r1804.ebuild [rename] https://crrev.com/95eb890655de64cbff74eeb0e8297471074f8643/chromeos-base/firewalld/firewalld-0.0.1-r858.ebuild
,
May 13 2016
The following revision refers to this bug: https://chrome-internal.googlesource.com/chromeos/manifest-internal/+/6db5b5516f1a00ddcdc41cb3c9e0b80fc525f1da commit 6db5b5516f1a00ddcdc41cb3c9e0b80fc525f1da Author: Alex Deymo <deymo@chromium.org> Date: Fri May 06 04:52:08 2016
,
May 13 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/manifest/+/b8eedfba9fa05d24fde3fedf863c9c0b622bb22f commit b8eedfba9fa05d24fde3fedf863c9c0b622bb22f Author: Alex Deymo <deymo@chromium.org> Date: Fri May 06 04:52:08 2016 Fetch forked AOSP repos from cros gerrit. These repos were forked back from the AOSP copy into the cros gerrit instance. BUG= chromium:609385 TEST=repo sync Change-Id: I3f7f1da5728c34ebaa905595bd758237defdfdf6 Reviewed-on: https://chromium-review.googlesource.com/343290 Commit-Ready: Alex Deymo <deymo@chromium.org> Tested-by: Alex Deymo <deymo@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> [modify] https://crrev.com/b8eedfba9fa05d24fde3fedf863c9c0b622bb22f/full.xml
,
May 18 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/c70ee2d1625c394ff0e5e428a7867dac9f4010cb commit c70ee2d1625c394ff0e5e428a7867dac9f4010cb Author: Alex Deymo <deymo@chromium.org> Date: Sat May 07 03:48:26 2016 Build AOSP forked repos from the chromium copy. This patch removes the blacklist on all the ebuilds that were forked to AOSP and builds them from the chromium gerrit copy instead, letting the CQ uprev them automatically. BUG= chromium:609385 TEST=trybot CQ-DEPEND=CL:344601,CL:344414 Change-Id: I62cecb0042572be1df4da87911143d422c7825e5 Reviewed-on: https://chromium-review.googlesource.com/343202 Commit-Ready: Alex Deymo <deymo@chromium.org> Tested-by: Alex Deymo <deymo@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/webserver/webserver-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/chromeos-minijail/chromeos-minijail-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/shill/shill-0.0.3-r13.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/update_engine/update_engine-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/chromeos-minijail/chromeos-minijail-0.0.1-r1464.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/libchrome/libchrome-381699-r4.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-0.0.1-r1080.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/tpm_manager/tpm_manager-0.0.1-r346.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/tpm_manager/tpm_manager-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/libchrome/libchrome-381699.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/update_engine-client/update_engine-client-0.0.1-r39.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/attestation/attestation-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/webserver/webserver-0.0.1-r681.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/shill/shill-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/firewalld/firewalld-0.0.1-r858.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/apmanager/apmanager-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/trunks/trunks-0.0.1-r1195.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/libbrillo/libbrillo-0.0.1-r22.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/attestation/attestation-0.0.1-r1064.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/shill-test-scripts/shill-test-scripts-0.0.1-r1804.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/shill-client/shill-client-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/apmanager/apmanager-0.0.1-r1069.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/update_engine/update_engine-0.0.3-r1899.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/firewalld/firewalld-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/shill-client/shill-client-0.0.1-r54.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/shill-test-scripts/shill-test-scripts-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/update_engine-client/update_engine-client-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/trunks/trunks-9999.ebuild [modify] https://crrev.com/c70ee2d1625c394ff0e5e428a7867dac9f4010cb/chromeos-base/libbrillo/libbrillo-9999.ebuild
,
Jul 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/aosp/platform/external/minijail/+/ce20704e0c05d10f9fa4365d7ec22f32ebdc42c7 commit ce20704e0c05d10f9fa4365d7ec22f32ebdc42c7 Author: Alex Deymo <deymo@google.com> Date: Fri May 13 01:35:49 2016 Fix .d generation in Chrome OS. Chrome OS toolchain generates "-:" instead of "-.o:" when reading the source from stdin "-". This patch makes the code handle both cases and fixes some missing quotes. Bug: chromium:609385 Bug: 27954979 TEST=FEATURES=test emerge-link chromeos-minijail (cherry picked from commit 477f2e32a7e4a6ce96baf960ad9f915f52f920a6) Change-Id: I783db1c0617cafa9b999500b49df36a927fe16b9 Reviewed-on: https://chromium-review.googlesource.com/360255 Commit-Ready: Dylan Reid <dgreid@chromium.org> Tested-by: Dylan Reid <dgreid@chromium.org> Reviewed-by: Stephen Barber <smbarber@chromium.org> [modify] https://crrev.com/ce20704e0c05d10f9fa4365d7ec22f32ebdc42c7/gen_syscalls.sh [modify] https://crrev.com/ce20704e0c05d10f9fa4365d7ec22f32ebdc42c7/gen_constants.sh |
||
►
Sign in to add a comment |
||
Comment 1 by phajdan.jr@chromium.org
, May 5 2016