diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-08-27 21:15:29 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-08-28 17:27:01 +0200 |
| commit | b1d0b1b0d82978359e80c468cc2a89ae42850a80 (patch) | |
| tree | d0930c3c28a7e111cf9e7e70526b0942e90847e4 | |
| parent | cce12c60c1946faf68296ffaa89f908e3155e1e0 (diff) | |
| download | manifest-b1d0b1b0d82978359e80c468cc2a89ae42850a80.tar.gz manifest-b1d0b1b0d82978359e80c468cc2a89ae42850a80.tar.bz2 manifest-b1d0b1b0d82978359e80c468cc2a89ae42850a80.zip | |
libsamsung-ipc: clarify that it comes from the main Replicant namespace
As libsamsung-ipc master is now supposed to compile under Replicant 10, it
has been included and enabled for the i9300 target to be built tested.
The focus is now to merge more and more patches upstream in the master
branch before adding an abstraction for the modem driver in the Replicant 9
or 10 kernel (which may or may not land in a branch).
Because of that, the replicant-next repository of libsamsung-ipc contains
outdated code, and the most recent code is in libsamsung-ipc master.
It also didn't compile with the replicant-next repository as all the fixes
for that weren't merged.
Because of all that, we are now using libsamsung-ipc from the master of
the main replicant namespace.
However, having remote="replicant-next" is confusing and prone to mistakes.
While it selects the exact same repository thanks to name="replicant/...",
at some point in the history that has been saved in the history/28-08-2020
branch, it was accidentally changed to use the replicant-next namespace
probably with sed by the following commit:
7747d021e3fd8c7b93b8aa9f25199130018e4c00
7747d021 move vendor/lineage to vendor/replicant
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | replicant/remotes.xml | 3 | ||||
| -rw-r--r-- | replicant/repositories.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/replicant/remotes.xml b/replicant/remotes.xml index ab9c1da..13d4a88 100644 --- a/replicant/remotes.xml +++ b/replicant/remotes.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest> + <remote name="replicant" + fetch="../.." /> + <remote name="replicant-next" revision="replicant-10" fetch="../.." /> diff --git a/replicant/repositories.xml b/replicant/repositories.xml index 0ea372a..5f970a9 100644 --- a/replicant/repositories.xml +++ b/replicant/repositories.xml @@ -16,7 +16,7 @@ <project path="external/libdrm" name="replicant-next/external_libdrm" groups="pdk" remote="replicant-next" /> <project path="external/mesa3d" name="replicant-next/external_mesa3d" remote="replicant-next" groups="pdk-cw-fs,pdk-fs" /> <project path="frameworks/base" name="replicant-next/frameworks_base" groups="pdk-cw-fs,pdk-fs" remote="replicant-next" /> - <project path="hardware/replicant/libsamsung-ipc" name="replicant/hardware_replicant_libsamsung-ipc" remote="replicant-next" revision="master" /> + <project path="hardware/replicant/libsamsung-ipc" name="replicant/hardware_replicant_libsamsung-ipc" remote="replicant" revision="master" /> <project path="hardware/samsung" name="replicant-next/hardware_samsung" remote="replicant-next" /> <project path="kernel/replicant/linux" name="replicant-next/kernel_replicant_linux" remote="replicant-next" /> <project path="manifest" name="replicant-next/manifest" remote="replicant-next" revision="replicant-10-dev" /> |