diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-06-23 18:56:34 +0200 |
|---|---|---|
| committer | Joonas Kylmälä <joonas.kylmala@iki.fi> | 2020-06-25 08:33:01 -0400 |
| commit | 2f1a13686e1c2eede4a782f57368a69548199019 (patch) | |
| tree | 48606319e9694f54fe09b6fce2e383227f691317 | |
| parent | 937b0d89e6a932a0d2f7bd06e1067170df3d9112 (diff) | |
| download | manifest-2f1a13686e1c2eede4a782f57368a69548199019.tar.gz manifest-2f1a13686e1c2eede4a782f57368a69548199019.tar.bz2 manifest-2f1a13686e1c2eede4a782f57368a69548199019.zip | |
Use mirrors for LineageOS repositories
LineageOS repositories don't use stable revisions and
because of that, the changes we have on top of LineageOS
repositories need to be rebased often as they need to be
kept in sync with the other repositories.
While it might be a good thing to constantly rebase in order
to get the last security fixes, this is not relevant at this
early stages of development where the devices are not used
daily.
Instead this makes us loose time and makes it harder to
contribute.
The other repositories could be mirrored too however they
all use stable revisions:
- All the repositories using the github and freedesktop
remotes use fixed revisions.
- All the AOSP repositories use a tag
The only exception being tools/repohook which is set to use
the master revision.
The git hosting infrastructure has also been adjusted to enable
to use git://git.replicant.us/mirrors/LineageOS/* and
https://git.replicant.us/mirrors/LineageOS/* in order to
make the manifest patch smaller and easier to rebase.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | default.xml | 7 | ||||
| -rw-r--r-- | replicant/remotes.xml | 9 | ||||
| -rw-r--r-- | replicant/repositories.xml (renamed from replicant/replicant-9.xml) | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/default.xml b/default.xml index 8c5fdf1..6342c61 100644 --- a/default.xml +++ b/default.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest> + <include name="replicant/remotes.xml" /> + <remote name="freedesktop" revision="master" fetch="https://gitlab.freedesktop.org/" /> @@ -17,7 +19,7 @@ revision="refs/tags/android-10.0.0_r37" /> <default revision="refs/heads/lineage-17.1" - remote="github" + remote="replicant-mirrors" sync-c="true" sync-j="4" /> @@ -686,7 +688,6 @@ <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" /> - <!-- Replicant repositories --> - <include name="replicant/replicant-9.xml" /> + <include name="replicant/repositories.xml" /> </manifest> diff --git a/replicant/remotes.xml b/replicant/remotes.xml new file mode 100644 index 0000000..ab9d5f4 --- /dev/null +++ b/replicant/remotes.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<manifest> + <remote name="replicant-9" + revision="replicant-9" + fetch=".." /> + + <remote name="replicant-mirrors" + fetch="../mirrors" /> +</manifest> diff --git a/replicant/replicant-9.xml b/replicant/repositories.xml index e87690e..856695c 100644 --- a/replicant/replicant-9.xml +++ b/replicant/repositories.xml @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest> - <remote name="replicant-9" - revision="replicant-9" - fetch=".." /> - <project path="build/make" name="replicant-9/build_make" groups="pdk" remote="replicant-9" revision="replicant-10"> <copyfile src="core/root.mk" dest="Makefile" /> <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" /> |