|
|
__Problem:__
|
|
|
|
|
|
TL:DR
|
|
|
|
|
|
The 'Solution' below is rubbish: we can't have mirroring and lose the history. If we work from the orphan branch, mirroring fails because the branches we created have diverged from the upstream branches.
|
|
|
|
|
|
So, for both repos
|
|
|
1. We'll set them up by creating in gitlab and pulling from upstream
|
|
|
2. Delete the upstream branches we are'nt interested in (everything before lineage-17.1)
|
|
|
2. We create our v1-d branch from the upstream lineage-17.1 branch, and make it our default branch
|
|
|
3. We make our changes in the default branch. If upstream branches change, we will merge thos (manually) into our default branch
|
|
|
|
|
|
|
|
|
- To build for Z5 Compact (suzuran), we need proprietary files from an [upstream repo `proprietary_vendor_sony`][1]. This has three device-specific directories `suzuran`, `sumire`, `satsuki`, and one shared directory `kitakami-common`. My existing manifest puts this in the `vendor/sony/` tree with `path="vendor/sony"`.
|
|
|
- We only need the files from `suzuran` and `kitakami-common`, which will end up in `vendor/sony/suzuran` and `vendor/sony/kitakami-common`.
|
|
|
- We need the files to be in two separate repos, to avoid namespace problems when building other Sony devices, which also have vendor files in the `vendor/sony/` tree.
|
... | ... | |