fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40765?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: debian: add copyright file
......................................................................
debian: add copyright file
Change-Id: I95d9314f7f858c02a6ac10641c958bbf13677814
---
A debian/copyright
1 file changed, 47 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..d9fcc54
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,47 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://gitea.osmocom.org/erlang/osmo-s1gw
+Upstream-Name: osmo-s1gw
+
+Files: src/*.erl
+ include/*.hrl
+ debian/*
+Copyright: sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+License: AGPL-3.0-or-later
+
+Files: contrib/osmo-s1gw.sh
+Copyright: sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+License: MPL-2.0
+
+
+License: AGPL-3.0-or-later
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ Additional Permission under GNU AGPL version 3 section 7:
+ .
+ If you modify this Program, or any covered work, by linking or
+ combining it with runtime libraries of Erlang/OTP as released by
+ Ericsson on https://www.erlang.org (or a modified version of these
+ libraries), containing parts covered by the terms of the Erlang Public
+ License (https://www.erlang.org/EPLICENSE), the licensors of this
+ Program grant you additional permission to convey the resulting work
+ without the need to license the runtime libraries of Erlang/OTP under
+ the GNU Affero General Public License. Corresponding Source for a
+ non-source form of such a combination shall include the source code
+ for the parts of the runtime libraries of Erlang/OTP used as well as
+ that of the covered work.
+
+License: MPL-2.0
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40765?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: I95d9314f7f858c02a6ac10641c958bbf13677814
Gerrit-Change-Number: 40765
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40771?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)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(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py
index e8598f0..afe9003 100644
--- a/_testenv/testenv/cmd.py
+++ b/_testenv/testenv/cmd.py
@@ -86,6 +86,7 @@
if install_dir and install_dir != "/":
path += f":{os.path.join(install_dir, 'bin')}"
+ path += f":{os.path.join(install_dir, 'usr/bin')}"
if podman:
path += ":/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
--
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: merged
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: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
osmith has submitted this change. ( 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(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
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: merged
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>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>