Bug #6011
closedclean up situation with titan.ProtocolModules.BSSMAP_v11.2.0
0%
Description
The first odd part is that we have this repoistory in gerrit, whcih is wrong. I'm not sure if we can remove it from gerrit somehow. If we can, we should.
The second odd part is that we are changing the whitespace/formatting of upstream projects, see
commit 0558f524ba0f24c94112a19d8cd822063207431b Author: Pau Espin Pedrol <pespin@sysmocom.de> Date: Thu Apr 15 13:47:06 2021 +0200 BSSAP_Types.ttcn: Fix trailing whitespace Change-Id: Idb4a329c56068d45299fbebd2b077d27255bb317
All this leads to, IMHO, is potential clashes/merge problems when both upstream and our code change. So let's avoid trying to change upstreams coding style.
We have one patch (osmux related) which doesn't make sense in upstream. So this means we keep a fork of upstream (on gitea.osmocom.org or github.eclipse.org) with that patch.
I just submitted a merge request containing VGCS/VBS related updates, see https://gitlab.eclipse.org/eclipse/titan/titan.ProtocolModules.BSSMAP_v11.2.0/-/merge_requests/3
So once that is merged, please rebase the OSMUX patch on the (then) upstream, and drop the whitespace patch. Last, but not least, the reference in our deps/Makefile should be updated.
Checklist
- remove (or hide) this upstream repo from our osmocom gerrit
- wait for / remind upstream to merge vgcs patch
- rebase osmux on top of that
- push osmux to branch on gitea.osmocom.org or gitlab.eclipse.org
- update reference in deps/Makefile