Attention is currently required from: fixeria, pespin.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-dev/+/40770?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: gen_makefile: support new Osmocom erlang makefiles
......................................................................
gen_makefile: support new Osmocom erlang makefiles
osmo-s1gw has a new install target that creates a complete release
package instead of running escriptize, which means different files will
need to be installed. From now on let's call the "install" target in the
Makefile if it exists.
Other erlang projects that osmo-dev supports:
* osmo-dia2gsup: "make install" works after adjusting it to support
REBAR_BASE_DIR (see patch mentioned below).
* osmo-epdg: doesn't have an "install" target in the Makefile yet, so it
will use the existing logic.
Depends: osmo-s1gw I5681ca103daf1c497218b4513b0ca97b1aae03d3
Depends: osmo-dia2gsup I9511341bced7d658eacb34250569dfbfe37c084c
Change-Id: I92d6fc6eb5a11068d4b3baca55dfb3abdedbbbf1
---
M gen_makefile.py
1 file changed, 18 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/70/40770/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40770?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I92d6fc6eb5a11068d4b3baca55dfb3abdedbbbf1
Gerrit-Change-Number: 40770
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/40781?usp=email )
Change subject: Makefile: add REBAR_BASE_DIR variable
......................................................................
Makefile: add REBAR_BASE_DIR variable
This allows building and running osmo-dia2gsup out-of-tree. Specifically
it allows calling "make install" from osmo-dev, which it will do after
the related patch is merged.
Related: osmo-dev I92d6fc6eb5a11068d4b3baca55dfb3abdedbbbf1
Change-Id: I9511341bced7d658eacb34250569dfbfe37c084c
---
M Makefile
1 file changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/81/40781/1
diff --git a/Makefile b/Makefile
index 4fe7282..0033622 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+# where rebar3 stores build output
+REBAR_BASE_DIR ?= _build
# config file used by 'run' and 'shell'
CONFIG ?= examples/dev.config
# directory paths for 'install'
@@ -12,7 +14,7 @@
rebar3 escriptize
run: build
- ERL_FLAGS='-config $(CONFIG)' _build/default/bin/osmo-dia2gsup
+ ERL_FLAGS='-config $(CONFIG)' $(REBAR_BASE_DIR)/default/bin/osmo-dia2gsup
shell: build
rebar3 shell --config $(CONFIG)
@@ -24,7 +26,7 @@
rebar3 dialyzer
install: build
- install -Dm0755 _build/default/bin/osmo-dia2gsup \
+ install -Dm0755 $(REBAR_BASE_DIR)/default/bin/osmo-dia2gsup \
$(DESTDIR)$(BINDIR)/osmo-dia2gsup
install -Dm0644 examples/sys.config \
$(DESTDIR)$(CONFDIR)/osmo-dia2gsup.config
@@ -32,12 +34,12 @@
$(DESTDIR)$(SYSTEMDUNITDIR)/osmo_dia2gsup.service
clean:
-# Avoid running rebar3 clean if _build doesn't exist, since it would try
-# to fetch deps from the Internet and that may not be avaialble when in
-# OBS build.
-ifneq ("$(wildcard _build/.*)", "")
+# Avoid running rebar3 clean if $(REBAR_BASE_DIR) doesn't exist, since it would
+# try to fetch deps from the Internet and that may not be avaialble when in OBS
+# build.
+ifneq ("$(wildcard $(REBAR_BASE_DIR)/.*)", "")
rebar3 clean
- rm -rf _build/
+ rm -rf $(REBAR_BASE_DIR)
else
rm -f src/diameter_*.erl
endif
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/40781?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: erlang/osmo_dia2gsup
Gerrit-Branch: master
Gerrit-Change-Id: I9511341bced7d658eacb34250569dfbfe37c084c
Gerrit-Change-Number: 40781
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40772?usp=email )
Change subject: s1gw/testenv: adjust to use new launcher script
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40772?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ief1579154bf46b9bc2551535ede3e1f14456d65d
Gerrit-Change-Number: 40772
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Jul 2025 08:59:10 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40770?usp=email )
Change subject: gen_makefile: support new Osmocom erlang makefiles
......................................................................
Patch Set 1:
(1 comment)
File gen_makefile.py:
https://gerrit.osmocom.org/c/osmo-dev/+/40770/comment/4e155100_767258a9?usp… :
PS1, Line 375: for i in {build_proj}/default/bin/*; do \\
: if [ -e "$$i" ]; then \\
: install -v -Dm755 "$$i" -t {shlex.quote(args.install_prefix)}/bin/; \\
> > Oh interesting! Apparently this doesn't get created in default/bin when REBAR_BASE_DIR is set [... […]
Ack, I'll give that a try.
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40770?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I92d6fc6eb5a11068d4b3baca55dfb3abdedbbbf1
Gerrit-Change-Number: 40770
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Jul 2025 08:35:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: osmith.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40773?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
The change is no longer submittable: Verified is unsatisfied now.
Change subject: testenv: podman: add libnftables-dev
......................................................................
testenv: podman: add libnftables-dev
This is required for building osmo-s1gw from source in podman,
otherwise:
/home/user/.cache/osmo-ttcn3-testenv/podman/make3/osmo-s1gw/default/lib/enftables/c_src/enftables.c:16:10: fatal error: nftables/libnftables.h: No such file or directory
16 | #include <nftables/libnftables.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
Change-Id: I0ae94f73f0875048d9a71d1582627e57e60425c6
---
M _testenv/data/podman/Dockerfile
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/40773/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40773?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0ae94f73f0875048d9a71d1582627e57e60425c6
Gerrit-Change-Number: 40773
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Attention is currently required from: osmith.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40771?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
The change is no longer submittable: Verified is unsatisfied now.
Change subject: testenv: Add $install_dir/usr/bin to $PATH
......................................................................
testenv: Add $install_dir/usr/bin to $PATH
When building programs from source, don't look only in $install_dir/bin,
but also in $install_dir/usr/bin for the binaries. osmo-s1gw installs to
usr/bin with recent changes and other programs may do this too.
Related: osmo-s1gw I5681ca103daf1c497218b4513b0ca97b1aae03d3
Change-Id: I8d652dba94bbd44217a3034ac012b6568941347d
---
M _testenv/testenv/cmd.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/40771/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40771?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8d652dba94bbd44217a3034ac012b6568941347d
Gerrit-Change-Number: 40771
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Attention is currently required from: fixeria, osmith, pespin.
Hello Jenkins Builder, fixeria, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40772?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review+2 by pespin, Verified+1 by Jenkins Builder
The change is no longer submittable: Code-Review and Verified are unsatisfied now.
Change subject: s1gw/testenv: adjust to use new launcher script
......................................................................
s1gw/testenv: adjust to use new launcher script
osmo-s1gw now gets started through a launcher script.
Depends: osmo-s1gw I5681ca103daf1c497218b4513b0ca97b1aae03d3
Change-Id: Ief1579154bf46b9bc2551535ede3e1f14456d65d
---
M s1gw/testenv.cfg
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/40772/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40772?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ief1579154bf46b9bc2551535ede3e1f14456d65d
Gerrit-Change-Number: 40772
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: osmith, pespin.
fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40770?usp=email )
Change subject: gen_makefile: support new Osmocom erlang makefiles
......................................................................
Patch Set 1:
(1 comment)
File gen_makefile.py:
https://gerrit.osmocom.org/c/osmo-dev/+/40770/comment/91dd719a_1335f8b0?usp… :
PS1, Line 375: for i in {build_proj}/default/bin/*; do \\
: if [ -e "$$i" ]; then \\
: install -v -Dm755 "$$i" -t {shlex.quote(args.install_prefix)}/bin/; \\
> Oh interesting! Apparently this doesn't get created in default/bin when REBAR_BASE_DIR is set [...]
I confirm that `dest/default/bin/setup_gen` does not get created when doing `REBAR_BASE_DIR=dest make release`. This is indeed weird, but yeah, I would not rely on checking presence of `dest/default/bin/*`.
> I would also have preferred this, but the problem is that the Makefile before https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40756 already has an install target, so this does not work.
Yes, but what's wrong with that? The old `install` recipe will install an escript, the new recipe will install complete release package and a bootstrap/launcher script. In both cases we'll end up with `$(DESTDIR)/usr/bin/osmo-app`. The key difference is how we pass the config file, but this is not a problem since we have `program=` and `program_latest=` in testenv, right?
> However, how about we add an install-osmo-dev: install target to the Makefile to make it explicit what osmo-dev should do [...]
TBH, I don't like this idea of adding an osmo-dev specific recipe, sorry.
Let's see if this is needed at all (see my thought above).
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40770?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I92d6fc6eb5a11068d4b3baca55dfb3abdedbbbf1
Gerrit-Change-Number: 40770
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 29 Jul 2025 21:17:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>