diff options
| author | Robert Sesek <rsesek@google.com> | 2017-01-11 23:27:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-11 23:27:36 +0000 |
| commit | 19a5166a0d2f80a038e6a1373500e8556f661923 (patch) | |
| tree | 8f2b4848633459c0f07ab32af39ad25de5f309e7 | |
| parent | b9ff15fb26185f7400510e1ef23886203f755dbe (diff) | |
| parent | af939513792302473869e78025a9b0d666c33fc5 (diff) | |
| download | seccomp-tests-19a5166a0d2f80a038e6a1373500e8556f661923.tar.gz | |
Update the instructions based on how the Gerrit ACL is setup for forge access. am: 933e0196bf
am: af93951379
Change-Id: Ia18426bcd7f2c1761462c992c1b43160fa99cffe
| -rw-r--r-- | README.md | 23 |
1 files changed, 18 insertions, 5 deletions
@@ -10,6 +10,9 @@ Rather than hold the entire Linux history in this repository, only the subdirect selftests are preserved here. In order to sync this repository to the upstream Linux, follow these instructions. +The pristine copy of the upstream source is kept on a branch called upstream-master. This branch is +then merged into an Android development branch. + ### First-Time Setup These instructions only need to be followed for the first time you are updating the repository from @@ -39,15 +42,25 @@ Perform these steps every time you need to update the test suite from upstream. git filter-branch --subdirectory-filter tools/testing/selftests/seccomp ``` -4. Start a new CL branch into which the updated sources will be merged: +4. Check out the upstream-master branch, which contains the pristine, filter-branch'd copy of the +source code. Pushing non-merge commits with a "forged" author/committer can only be done against +the upstream-master branch. ``` - repo start sync-upstream . + git checkout -b upstream-master aosp/upstream-master ```` -5. Subtree-merge the changes into the directory. Resolve any conflicts with the local modifications -present in the repository. +5. Update this upstream-master branch to the newly filtered branch of upstream-linux. ``` - git subtree merge -P linux/ update-YYYYMMDD + git merge --ff-only update-YYYYMMDD + ``` + +6. Upload the changes on upstream-master for review and submit them. + +7. Merge the changes from upstream-master into the Android development branch (typically master). +Resolve any conflicts with the local modifications present in the repository. + ``` + repo start sync-upstream . + git subtree merge -P linux/ upstream-master ``` Now build and test the changes by running CTS: |