daniel has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30047 )
Change subject: hnbgw: Only build with_pfcp on master
......................................................................
hnbgw: Only build with_pfcp on master
The functionality is not in -latest yet so running osmo-hnbgw with this
configuration fails which in turn fails the test in jenkins instead of
just marking it unstable.
Change-Id: I4309c323c1d61e8f22dae499c407d57999f6f13a
---
M ttcn3-hnbgw-test/jenkins.sh
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh
index 8c1ddf5..fee2728 100755
--- a/ttcn3-hnbgw-test/jenkins.sh
+++ b/ttcn3-hnbgw-test/jenkins.sh
@@ -80,6 +80,9 @@
echo Testing without PFCP
run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg"
-echo Testing with PFCP
-mkdir "$VOL_BASE_DIR_PFCP"
-run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
+# Disable until osmo-hnbgw release >1.3.0
+if image_suffix_is_master; then
+ echo Testing with PFCP
+ mkdir "$VOL_BASE_DIR_PFCP"
+ run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
+fi
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30047
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I4309c323c1d61e8f22dae499c407d57999f6f13a
Gerrit-Change-Number: 30047
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30047 )
Change subject: hnbgw: Only build with_pfcp on master
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30047
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I4309c323c1d61e8f22dae499c407d57999f6f13a
Gerrit-Change-Number: 30047
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 07 Nov 2022 10:17:33 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30037 )
Change subject: Add support of RPM package building via osmo-e1d.spec.in
......................................................................
Add support of RPM package building via osmo-e1d.spec.in
Change-Id: If9d3d4b7b06aef156fd895415db3b30bdecd74b4
---
M configure.ac
M contrib/Makefile.am
A contrib/osmo-e1d.spec.in
3 files changed, 141 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/configure.ac b/configure.ac
index f671591..dbfd230 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,6 +115,7 @@
Makefile
contrib/Makefile
contrib/systemd/Makefile
+ contrib/osmo-e1d.spec
doc/Makefile
doc/examples/Makefile
src/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 3439c97..094b092 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1 +1,5 @@
SUBDIRS = systemd
+
+EXTRA_DIST = \
+ osmo-e1d.spec.in \
+ $(NULL)
diff --git a/contrib/osmo-e1d.spec.in b/contrib/osmo-e1d.spec.in
new file mode 100644
index 0000000..c836dba
--- /dev/null
+++ b/contrib/osmo-e1d.spec.in
@@ -0,0 +1,136 @@
+#
+# spec file for package osmo-e1d
+#
+# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2019-2021, Martin Hauke <mardnh(a)gmx.de>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+Name: osmo-e1d
+Version: @VERSION@
+Release: 0
+Summary: Osmocom E1 Daemon
+License: GPL-2.0-or-later
+Group: Productivity/Telephony/Utilities
+URL: https://osmocom.org/projects/osmo-e1d/wiki/Wiki
+Source: %{name}-%{version}.tar.xz
+BuildRequires: automake >= 1.9
+BuildRequires: libtool >= 2
+BuildRequires: pkg-config >= 0.20
+%if 0%{?suse_version}
+BuildRequires: systemd-rpm-macros
+%endif
+BuildRequires: pkgconfig(libosmocore) >= 1.7.0
+BuildRequires: pkgconfig(libosmousb) >= 1.7.0
+BuildRequires: pkgconfig(libosmovty) >= 1.7.0
+BuildRequires: pkgconfig(talloc) >= 2.0.1
+%{?systemd_requires}
+
+%description
+osmo-e1d is an E1 interface daemon that is part of the Osmocom E1
+interface driver architecture. It was primarily written for the
+ICE40_E1_USB_interface (ICE40 based E1 framer IP core developed by
+tnt).
+
+osmo-e1d acts as an interface between the hardware/firmware of the E1
+interface on the bottom side, and applications wanting to use E1
+timeslots on the top side.
+
+%package -n libosmo-e1d1
+Summary: Osmocom E1 daemon protocol library
+License: LGPL-3.0-or-later
+Group: System/Libraries
+
+%description -n libosmo-e1d1
+Osmocom E1 Daemon Protocol Library.
+
+%package -n libosmo-octoi0
+Summary: Library for the Osmocom Community TDMoIP network
+License: LGPL-3.0-or-later
+Group: System/Libraries
+
+%description -n libosmo-octoi0
+Library for the Osmocom Community TDMoIP network.
+
+%package devel
+Summary: Header files for the Osmocom E1 daemon protocol library
+License: LGPL-3.0-or-later
+Group: Development/Libraries/C and C++
+Requires: libosmo-e1d1 = %version-%release
+Requires: libosmo-octoi0 = %version-%release
+Provides: libosmo-e1d-devel = %version-%release
+Obsoletes: libosmo-e1d-devel < %version-%release
+
+%description devel
+This subpackage contains libraries and header files for developing
+applications that want to make use of libosmo-e1d.
+
+%prep
+%setup -q
+
+%build
+echo "%version" >.tarball-version
+autoreconf -fiv
+# bugzilla.opensuse.org/795968 for rationale
+%configure --includedir="%_includedir/%name" --disable-static \
+ --docdir="%_docdir/%name" \
+ --with-systemdsystemunitdir="%_unitdir"
+%make_build
+
+%install
+%make_install
+find "%buildroot" -type f -name "*.la" -delete -print
+rm -Rf "%buildroot/%_sysconfdir/osmocom"
+
+%check
+%make_build check || find . -name testsuite.log -exec cat {} +
+
+%post -n libosmo-e1d1 -p /sbin/ldconfig
+%postun -n libosmo-e1d1 -p /sbin/ldconfig
+%post -n libosmo-octoi0 -p /sbin/ldconfig
+%postun -n libosmo-octoi0 -p /sbin/ldconfig
+
+%if 0%{?suse_version}
+%preun
+%service_del_preun %name.service
+
+%postun
+%service_del_postun %name.service
+
+%pre
+%service_add_pre %name.service
+
+%post
+%service_add_post %name.service
+%endif
+
+%files
+%license COPYING COPYING.gpl2 COPYING.lgpl3
+%doc README.md
+%_bindir/osmo-e1d
+%_bindir/osmo-e1d-pipe
+%dir %_docdir/%name
+%dir %_docdir/%name/examples
+%_docdir/%name/examples/
+%_unitdir/osmo-e1d.service
+
+%files -n libosmo-e1d1
+%_libdir/libosmo-e1d.so.*
+
+%files -n libosmo-octoi0
+%_libdir/libosmo-octoi.so.*
+
+%files devel
+%_includedir/%name/
+%_libdir/libosmo-e1d.so
+%_libdir/libosmo-octoi.so
+%_libdir/pkgconfig/*.pc
+
+%changelog
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30037
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: If9d3d4b7b06aef156fd895415db3b30bdecd74b4
Gerrit-Change-Number: 30037
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: osmith.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30037 )
Change subject: Add support of RPM package building via osmo-e1d.spec.in
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30037
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: If9d3d4b7b06aef156fd895415db3b30bdecd74b4
Gerrit-Change-Number: 30037
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 07 Nov 2022 10:13:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30048 )
Change subject: vty/logging.h: Avoid -Werror=pragmas error in C++ code
......................................................................
vty/logging.h: Avoid -Werror=pragmas error in C++ code
The newly-introdiced pragma to disable strict-prototypes checking works
in C, but creates a -Werror=pragmas error in C++ code:
In file included from osmo-trx.cpp:45:
/build/deps/install/stow/libosmocore/include/osmocom/vty/logging.h:10:32: error: option
‘-Wstrict-prototypes’ is valid for C/ObjC but not for C++ [-Werror=pragmas]
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
So let's also suppress those errors for that one line of code...
Change-Id: I85596cf4538d7a8c522f4bce1620a2d19e2a910e
---
M include/osmocom/vty/logging.h
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved; Verified
diff --git a/include/osmocom/vty/logging.h b/include/osmocom/vty/logging.h
index 9be96e5..b3ce92c 100644
--- a/include/osmocom/vty/logging.h
+++ b/include/osmocom/vty/logging.h
@@ -7,6 +7,7 @@
struct log_info;
#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
/* note this undefined argument declaration is intentional. There used
* to be an argument until 2017 which we no longer need .*/
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30048
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I85596cf4538d7a8c522f4bce1620a2d19e2a910e
Gerrit-Change-Number: 30048
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: laforge.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30037 )
Change subject: Add support of RPM package building via osmo-e1d.spec.in
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30037
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: If9d3d4b7b06aef156fd895415db3b30bdecd74b4
Gerrit-Change-Number: 30037
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Mon, 07 Nov 2022 10:09:38 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30037 )
Change subject: Add support of RPM package building via osmo-e1d.spec.in
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS1:
> Hi osmith, please take over here. […]
the problem was that "%autosetup -p1" instead of "%setup -q" was used in the %prep section. this caused the expected directory of the source inside the tarball to be "osmo-e1d-0.4.0.16.713e" instead of "osmo-e1d", and so the build failed with:
+ cd osmo-e1d-0.4.0.16.713e
/var/tmp/rpm-tmp.6eS2t1: line 41: cd: osmo-e1d-0.4.0.16.713e: No such file or directory
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30037
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: If9d3d4b7b06aef156fd895415db3b30bdecd74b4
Gerrit-Change-Number: 30037
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Mon, 07 Nov 2022 10:06:49 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
osmith has uploaded a new patch set (#2) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30037 )
Change subject: Add support of RPM package building via osmo-e1d.spec.in
......................................................................
Add support of RPM package building via osmo-e1d.spec.in
Change-Id: If9d3d4b7b06aef156fd895415db3b30bdecd74b4
---
M configure.ac
M contrib/Makefile.am
A contrib/osmo-e1d.spec.in
3 files changed, 141 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/37/30037/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30037
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: If9d3d4b7b06aef156fd895415db3b30bdecd74b4
Gerrit-Change-Number: 30037
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30050 )
Change subject: gitreview: new file
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30050
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I32ef094163ad157c6174730fa4f0b51038280107
Gerrit-Change-Number: 30050
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 07 Nov 2022 09:40:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment