diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2022-08-19 12:32:30 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2022-08-19 13:13:57 +0200 |
| commit | cfa6b53b4984730797c850cec336a3b4f5e4897e (patch) | |
| tree | 3c59071756a3c4506a25c5728046f77a6a7b7032 | |
| parent | a8536d884774e2297a3eb90b6f258911f8e43234 (diff) | |
HACK: obs: add nftables, libnftnlosmith/obs-nftables
I've used this to import latest versions of nftables and libnftnl
packaging from debian's salsa to our OBS (for building osmo-upf).
./update_obs_project.py -f latest obs:proj:path nftables-deb
./update_obs_project.py -f latest obs:proj:path libnftnl-deb
Change-Id: I699ebe4fe8ec93a01fa8c3bd17693d5f8fca5804
| -rw-r--r-- | scripts/obs/lib/config.py | 6 | ||||
| -rw-r--r-- | scripts/obs/lib/srcpkg.py | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 947b722..7a0f1fd 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -80,16 +80,20 @@ projects_osmocom = [ "simtrace2", ] projects_other = [ + "libnftnl-deb", "limesuite", "neocon", + "nftables-deb", "open5gs", ] git_url_default = "https://gerrit.osmocom.org" # /project gets appended git_url_other = { + "libnftnl-deb": "https://salsa.debian.org/pkg-netfilter-team/pkg-libnftnl", "libosmo-dsp": "https://gitea.osmocom.org/sdr/libosmo-dsp", "limesuite": "https://github.com/myriadrf/LimeSuite", "neocon": "https://github.com/laf0rge/neocon", + "nftables-deb": "https://salsa.debian.org/pkg-netfilter-team/pkg-nftables", "open5gs": "https://github.com/open5gs/open5gs", "osmo-fl2k": "https://gitea.osmocom.org/sdr/osmo-fl2k", "rtl-sdr": "https://gitea.osmocom.org/sdr/rtl-sdr", @@ -102,7 +106,9 @@ git_branch_other = { git_latest_tag_pattern_default = "^[0-9]*\\.[0-9]*\\.[0-9]*$" git_latest_tag_pattern_other = { + "libnftnl-deb": "^debian\/[0-9]*\\.[0-9]*\\.[0-9]*.*$", "limesuite": "^v[0-9]*\\.[0-9]*\\.[0-9]*$", + "nftables-deb": "^debian\/[0-9]*\\.[0-9]*\\.[0-9]*.*$", "open5gs": "^v[0-9]*\\.[0-9]*\\.[0-9]*$", } diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index baf64a9..60cb6e5 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -58,6 +58,12 @@ def get_version_for_feed(project, feed, conflict_version): # There's always a tag if we are here. If there was none, the build # would have been skipped for latest. ret = lib.git.get_latest_tag(project) + + # HACK: remove -1, -2 etc. from debian version, so we can build it as + # format "3.0 (native)" + ret = ret.replace("debian/", "") + ret = ret.split("-")[0] + return ret[1:] if ret.startswith("v") else ret ret = get_git_version(project) |