October 2023 - gerrit-log - lists.osmocom.org

[S] Change in ...osmo-epdg[master]: Add contrib/jenkins.sh
by pespin 05 Oct '23

05 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email ) Change subject: Add contrib/jenkins.sh ...................................................................... Add contrib/jenkins.sh Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 --- A contrib/jenkins.sh 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Verified osmith: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..87eae34 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,5 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 escriptize +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 Gerrit-Change-Number: 34656 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
by pespin 05 Oct '23

05 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email ) Change subject: Initial work to have proper app compilation and escript generation ...................................................................... Initial work to have proper app compilation and escript generation Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 --- A Makefile M rebar.config A rebar.lock R src/osmo_epdg.app.src A src/osmo_epdg.erl R src/osmo_epdg_app.erl R src/osmo_epdg_sup.erl 7 files changed, 67 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, approved; Verified fixeria: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..43e749d --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +all: build + +build: + rebar3 compile + rebar3 escriptize + +run: build + _build/default/bin/osmo-epdg + +check: + rebar3 eunit + +clean: + rm -rf _build/ diff --git a/rebar.config b/rebar.config index d0176c4..51852e4 100644 --- a/rebar.config +++ b/rebar.config @@ -36,7 +36,7 @@ {escript_name, "osmo-epdg"}. {relx, - [{release, {"osmo-epdg", "1.0.0"}, [epdg]}, + [{release, {"osmo-epdg", "1.0.0"}, [osmo_epdg]}, {sys_config, "./config/sys.config"}, {vm_args, "./config/vm.args"}, {dev_mode, true}, diff --git a/rebar.lock b/rebar.lock new file mode 100644 index 0000000..4c53cab --- /dev/null +++ b/rebar.lock @@ -0,0 +1,32 @@ +{"1.2.0", +[{<<"epcap">>, + {git,"https://github.com/msantos/epcap", + {ref,"d5c03caf608c1369e68cfed0a606d3eb82ddfd21"}}, + 1}, + {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1}, + {<<"lager">>, + {git,"https://github.com/erlang-lager/lager", + {ref,"459a3b2cdd9eadd29e5a7ce5c43932f5ccd6eb88"}}, + 0}, + {<<"osmo_gsup">>, + {git,"https://gitea.osmocom.org/erlang/osmo_gsup", + {ref,"ee15ee2b44f4a57c57831393d1fed2dc215d36e4"}}, + 0}, + {<<"osmo_ss7">>, + {git,"https://gitea.osmocom.org/erlang/osmo_ss7", + {ref,"3c6cdc5a53c4a5ec1aff417f2cbfaa9449004ee6"}}, + 0}, + {<<"parse_trans">>, + {git,"https://github.com/uwiger/parse_trans", + {ref,"cdb01ba260ba9a00b2aafa17affead0f6fac081c"}}, + 1}, + {<<"pkt">>, + {git,"https://github.com/msantos/pkt", + {ref,"67a4a14f596fded5ad5f2d8f94318faa8ad2c288"}}, + 1}]}. +[ +{pkg_hash,[ + {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>}]}, +{pkg_hash_ext,[ + {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>}]} +]. diff --git a/src/epdg.app.src b/src/osmo_epdg.app.src similarity index 89% rename from src/epdg.app.src rename to src/osmo_epdg.app.src index 4a11ef8..b75cf4d 100644 --- a/src/epdg.app.src +++ b/src/osmo_epdg.app.src @@ -1,5 +1,5 @@ %-*- mode: erlang -*- -{application, epdg, +{application, osmo_epdg, [ {description, "ePDG"}, {vsn, "1"}, diff --git a/src/osmo_epdg.erl b/src/osmo_epdg.erl new file mode 100644 index 0000000..41ce704 --- /dev/null +++ b/src/osmo_epdg.erl @@ -0,0 +1,7 @@ +-module(osmo_epdg). + +-export([main/1]). + +main(_Args) -> + application:ensure_all_started(?MODULE), + timer:sleep(infinity). diff --git a/src/epdg_app.erl b/src/osmo_epdg_app.erl similarity index 67% rename from src/epdg_app.erl rename to src/osmo_epdg_app.erl index 8bf2279..197fb97 100644 --- a/src/epdg_app.erl +++ b/src/osmo_epdg_app.erl @@ -1,12 +1,11 @@ --module(epdg_app). - +-module(osmo_epdg_app). -behaviour(application). -export([start/2, stop/1]). start(_StartType, _StartArgs) -> - epdg_sup:start_link(). + osmo_epdg_sup:start_link(). stop(_State) -> ok. diff --git a/src/epdg_sup.erl b/src/osmo_epdg_sup.erl similarity index 94% rename from src/epdg_sup.erl rename to src/osmo_epdg_sup.erl index 836fa9c..231d27f 100644 --- a/src/epdg_sup.erl +++ b/src/osmo_epdg_sup.erl @@ -1,4 +1,4 @@ --module(epdg_sup). +-module(osmo_epdg_sup). -behaviour(supervisor). -export([start_link/0]). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in ...osmo-epdg[master]: Add debian build support
by pespin 05 Oct '23

05 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support ...................................................................... Add debian build support Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f --- A contrib/generate_build_dep.sh A contrib/osmo-epdg.service A contrib/systemd/osmo-epdg.service A debian/changelog A debian/compat A debian/control A debian/osmo-epdg.install A debian/rules 8 files changed, 98 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/contrib/generate_build_dep.sh b/contrib/generate_build_dep.sh new file mode 100755 index 0000000..409c2f5 --- /dev/null +++ b/contrib/generate_build_dep.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# execute the script from the top dir of this repository to generate +# a build_dep.tar.gz for building with debian/OBS + +if [ ! -e rebar.config ] ; then + echo "Please execute $0 from the top directory of the osmo-epdg directory" + exit 1 +fi + +set -x +rm -rf _checkouts _build +rebar3 get-deps +mkdir _checkouts +mv ./_build/default/lib/* _checkouts/ +mv ./_build/default/plugins/* _checkouts/ +# delete erlang bytecode +find _checkouts/ -iname '*beam' -delete +tar czf build_dep.tar.gz ./_checkouts diff --git a/contrib/osmo-epdg.service b/contrib/osmo-epdg.service new file mode 100644 index 0000000..bfa8293 --- /dev/null +++ b/contrib/osmo-epdg.service @@ -0,0 +1,15 @@ +[Unit] +Description=Osmocom ePDG (Evolved Packet Data Gateway) +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +Environment="HOME=/var/lib/osmo-epdg" +ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg +ExecStart=/usr/bin/osmo-epdg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/osmo-epdg.service b/contrib/systemd/osmo-epdg.service new file mode 100644 index 0000000..a62a972 --- /dev/null +++ b/contrib/systemd/osmo-epdg.service @@ -0,0 +1,16 @@ +[Unit] +Description=Osmocom DIAMETER to GSUP translator +After=osmo-hlr.service +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +Environment="HOME=/var/lib/osmo-epdg" +ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg +ExecStart=/usr/bin/osmo-epdg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/changelog @@ -0,0 +1 @@ + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..c484b29 --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: osmo-epdg +Maintainer: Osmocom team <openbsc(a)lists.osmocom.org> +Section: net +Priority: optional +Build-Depends: erlang-nox, + libpcap-dev, + rebar3, + debhelper (>= 10) +Standards-Version: 4.5.0 + +Package: osmo-epdg +Architecture: any +Depends: erlang-nox +Multi-Arch: allowed +Description: Osmocom ePDG (Evolved Packet Data Gateway) + diff --git a/debian/osmo-epdg.install b/debian/osmo-epdg.install new file mode 100644 index 0000000..0840d06 --- /dev/null +++ b/debian/osmo-epdg.install @@ -0,0 +1,2 @@ +/contrib/systemd/osmo-epdg.service /lib/systemd/system/ +/_build/default/bin/osmo-epdg /usr/bin/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..89863f8 --- /dev/null +++ b/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f +export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/default.mk +export ERL_COMPILER_OPTIONS=deterministic + +%: + dh $@ + +override_dh_auto_build: + dh_auto_build + if [ -e build_dep.tar.gz ] ; then tar xzf ./build_dep.tar.gz ; fi + rebar3 compile + rebar3 escriptize + rebar3 eunit + +override_dh_clean: + dh_clean + rm -rf _build _checkouts -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in ...osmo-epdg[master]: Add debian build support
by pespin 05 Oct '23

05 Oct '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 15:55:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in ...osmo-epdg[master]: Add debian build support
by pespin 05 Oct '23

05 Oct '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 15:55:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in ...osmo-epdg[master]: Add debian build support
by pespin 05 Oct '23

05 Oct '23

Attention is currently required from: pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 0

[S] Change in ...osmo-epdg[master]: Add contrib/jenkins.sh
by pespin 05 Oct '23

05 Oct '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email ) Change subject: Add contrib/jenkins.sh ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 Gerrit-Change-Number: 34656 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 15:55:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: Add contrib/jenkins.sh
by pespin 05 Oct '23

05 Oct '23

Attention is currently required from: pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email ) Change subject: Add contrib/jenkins.sh ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 Gerrit-Change-Number: 34656 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 0

[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
by pespin 05 Oct '23

05 Oct '23

Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email ) Change subject: Initial work to have proper app compilation and escript generation ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 05 Oct 2023 15:55:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
by pespin 05 Oct '23

05 Oct '23

Attention is currently required from: lynxis lazus. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email ) Change subject: Initial work to have proper app compilation and escript generation ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: deleteVote

1 0