diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-01-08 15:07:24 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-01-08 15:07:24 +0200 |
| commit | 2e9f07337732c39b263be00b7d665f211bf7859a (patch) | |
| tree | 10dce0ee3f0791e30a99e8a2aa6c231ab9710597 | |
| parent | 313906b9d1af0ec66492ba606979b01c8d224d45 (diff) | |
| download | scripts-2e9f07337732c39b263be00b7d665f211bf7859a.tar.gz scripts-2e9f07337732c39b263be00b7d665f211bf7859a.tar.bz2 scripts-2e9f07337732c39b263be00b7d665f211bf7859a.zip | |
aosp-merger: Correct README
Change-Id: I277885863cc5860399d55c5457503e29cd6123c0
| -rw-r--r-- | aosp-merger/README.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/aosp-merger/README.md b/aosp-merger/README.md index 8ec1e08..2470cd5 100644 --- a/aosp-merger/README.md +++ b/aosp-merger/README.md @@ -2,16 +2,16 @@ 1. Snapshot the names of your current working branches to `branches.list` file: - ./lineage/scripts/aosp-merge/branches_save.sh + ./lineage/scripts/aosp-merger/branches_save.sh -2. Note current aosp tag in `.repo/manifests/default.xml`, update it to desired new tag and then create a local commit for the change (aosp-merge script checks for any uncommitted changes in the `.repo/manifests` git repo). +2. Note current aosp tag in `.repo/manifests/default.xml`, update it to desired new tag and then create a local commit for the change (aosp-merger script checks for any uncommitted changes in the `.repo/manifests` git repo). 3. Create a staging branch and merge in the new AOSP tag: - ./lineage/scripts/aosp-merge/aosp-merge.sh merge \<oldaosptag> \<newaosptag> + ./lineage/scripts/aosp-merger/aosp-merger.sh merge \<oldaosptag> \<newaosptag> (where oldaosptag is the original AOSP tag that was in `.repo/manifests/default.xml`) * Example invocation: - ./lineage/scripts/aosp-merge/aosp-merge.sh merge android-8.0.0_r3 android-8.0.0_r30 + ./lineage/scripts/aosp-merger/aosp-merger.sh merge android-8.0.0_r3 android-8.0.0_r30 4. Every project in your tree should now be one of: * \<newaosptag> if the project was tracking AOSP @@ -19,10 +19,10 @@ * the default repo lineage branch for `.repo/manifests/snippets.xml` projects 5. Restore your local branches and merge in the staging branch: - ./lineage/scripts/aosp-merge/branches_rebase.sh \<nameofstagingbranch> + ./lineage/scripts/aosp-merger/branches_rebase.sh \<nameofstagingbranch> * Example invocation: - ./lineage/scripts/aosp-merge/branches_rebase.sh staging/lineage-15.0_merge-android-8.0.0_r30 + ./lineage/scripts/aosp-merger/branches_rebase.sh staging/lineage-15.0_merge-android-8.0.0_r30 6. Build, install, boot, verify, etc. # TODO |