LineageOS/scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aosp-merger: README: Fix typos

Browse Source 
Change-Id: Ia69312603823cc11af79a3e92530b9b3e85eb9e6
This commit is contained in:
Nolen Johnson
2023-09-11 14:23:52 -04:00
parent 09efdf2c18
commit a01711d6e9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aosp-merger/README.md
View File

@@ -6,7 +6,7 @@
Standard Variables:
`commmon` - Stores the following data:
`common` - Stores the following data:
* `os_branch` - Previous/current LineageOS version
* `device_branch` - Previous/current branch name
@@ -16,13 +16,13 @@ Standard Variables:
Special Variables:
`$platformName` - e.g. `qcom` - These files store tags specific to relevant non-AOSP repositories where upstream repos are reguarly merged, such as CAF/CLO repositories.
`$platformName` - e.g. `qcom` - These files store tags specific to relevant non-AOSP repositories where upstream repos are regularly merged, such as CAF/CLO repositories.
* e.g. `qcom` - Stores names of relevant SoC platforms mapped to the tag we currently track for that platform's repositories
`devices` - This file stores the matrix of devices we currently merge upstream repositories monthly for
`pixels` - This file stores the matrix of Pixel devices we currently merge upstream AOSP repositories monthly for, which coorelates directly to the current list of Google supported Pixel devices
`pixels` - This file stores the matrix of Pixel devices we currently merge upstream AOSP repositories monthly for, which correlates directly to the current list of Google supported Pixel devices
`kernel_repos` - This file stores a matrix of kernel-paths relevant to AOSP devices we currently merge upstream AOSP repositories monthly for
@@ -50,7 +50,7 @@ To merge a new AOSP tag platform-wide:
7. Execute `repo sync` on the working tree
8. Edit `${TOP/vendor/lineage/vars/common` moving the currently tracked tag from `common_aosp_tag` to `prev_common_aosp_tag`, then updating `common_aosp_tag` to reflect the newly tracked tag, and then do the same for `prev_common_aosp_build_id` and `common_aosp_build_id` - lastly, update the `topic` variable to reflect the current month
8. Edit `${TOP}/vendor/lineage/vars/common` moving the currently tracked tag from `common_aosp_tag` to `prev_common_aosp_tag`, then updating `common_aosp_tag` to reflect the newly tracked tag, and then do the same for `prev_common_aosp_build_id` and `common_aosp_build_id` - lastly, update the `topic` variable to reflect the current month
9. Run `aosp-merger/aosp-merger.sh`, this will take some time, and reads all the variables you set up above while merging the new tags to all relevant tracked repos. This will likely create conflicts on some forked repository, and will ask you to resolve them. It will then issue a final check to ask you if you'd like to upload the merge to gerrit, then after approval uploads the merge to Gerrit for review.
@@ -96,4 +96,4 @@ To merge a new CAF/CLO tag to all forked repositories:
3. Run the merger script on whatever platforms you have updated the tags to create merges and upload them to Gerrit - e.g. To merge on all support platforms you'd run `for platform in qssi msm8953 sdm660 sdm845 msmnile kona lahaina waipio-vendor waipio-video; do aosp-merger/aosp-merger.sh clo $platform done`
4. When testing is done, a global committer or higher can run the merger script to push the merges to HEADs - e.g. To push afformentioned merges on all support platforms you'd run `for platform in qssi msm8953 sdm660 sdm845 msmnile kona lahaina waipio-vendor waipio-video; do aosp-merger/aosp-merger.sh submit-clo $platform done`
4. When testing is done, a global committer or higher can run the merger script to push the merges to HEADs - e.g. To push aforementioned merges on all support platforms you'd run `for platform in qssi msm8953 sdm660 sdm845 msmnile kona lahaina waipio-vendor waipio-video; do aosp-merger/aosp-merger.sh submit-clo $platform done`