3 files changed, 15 insertions, 89 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 7c620b92..e7b9c763 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -55,8 +55,8 @@ elif [ "$with_dsp" = oc2g ]; then
   cd "$base"
 
 elif [ -z "$with_dsp" -o "$with_dsp" = none ]; then
-  echo "Direct DSP access disabled, sanitizer enabled"
-  PCU_CONFIG="$PCU_CONFIG --enable-werror --enable-sanitize"
+  echo "Ericsson E1 CCU support enabled, sanitizer enabled"
+  PCU_CONFIG="$PCU_CONFIG --enable-werror --enable-sanitize --enable-er-e1-ccu"
 else
   echo 'Invalid $with_dsp value:' $with_dsp
   exit 1
@@ -80,6 +80,8 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
 export PATH="$inst/bin:$PATH"
 
+osmo-build-dep.sh libosmo-abis "" --disable-dahdi
+
 if [ "$WITH_MANUALS" = "1" ]; then
   PCU_CONFIG="$PCU_CONFIG --enable-manuals"
 fi
diff --git a/contrib/osmo-pcu.spec.in b/contrib/osmo-pcu.spec.in
deleted file mode 100644
index 96e94810..00000000
--- a/contrib/osmo-pcu.spec.in
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# spec file for package osmo-pcu
-#
-# Copyright (c) 2017, Martin Hauke <mardnh@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-pcu
-Version:        @VERSION@
-Release:        0
-Summary:        Osmocom GPRS Packet Control Unit (PCU)
-License:        GPL-2.0-only
-Group:          Productivity/Telephony/Servers
-URL:            https://osmocom.org/projects/osmopcu
-Source:         %{name}-%{version}.tar.xz
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  pkgconfig >= 0.20
-%if 0%{?suse_version}
-BuildRequires:  systemd-rpm-macros
-%endif
-BuildRequires:  pkgconfig(libosmocore) >= 1.5.0
-BuildRequires:  pkgconfig(libosmogb) >= 1.5.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.5.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.5.0
-BuildRequires:  pkgconfig(libosmoctrl) >= 1.5.0
-%{?systemd_requires}
-
-%description
-Osmocom PCU code (RLC/MAC/PCU) for OpenBTS and OsmoBTS.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure \
-  --enable-shared \
-  --disable-static \
-  --docdir=%{_docdir}/%{name} \
-  --with-systemdsystemunitdir=%{_unitdir}
-make %{?_smp_mflags}
-
-%install
-%make_install
-
-%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
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%files
-%license COPYING
-%doc README.md
-%doc %{_docdir}/%{name}/examples
-%{_bindir}/osmo-pcu
-%dir %{_sysconfdir}/osmocom
-%config(noreplace) %{_sysconfdir}/osmocom/osmo-pcu.cfg
-%{_unitdir}/%{name}.service
-
-%changelog
diff --git a/contrib/systemd/osmo-pcu.service b/contrib/systemd/osmo-pcu.service
index 6329d31e..8c0fd69a 100644
--- a/contrib/systemd/osmo-pcu.service
+++ b/contrib/systemd/osmo-pcu.service
@@ -1,16 +1,23 @@
 [Unit]
 Description=Osmocom osmo-pcu
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/osmo-pcu -c /etc/osmocom/osmo-pcu.cfg
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 Restart=always
+User=osmocom
+Group=osmocom
 RestartSec=2
-RestartPreventExitStatus=1
-
-# The msg queues must be read fast enough
+AmbientCapabilities=CAP_SYS_NICE
+# CPU scheduling policy:
 CPUSchedulingPolicy=rr
-CPUSchedulingPriority=1
+# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority):
+CPUSchedulingPriority=20
+# See sched(7) for further details on real-time policies and priorities
 
 [Install]
 WantedBy=multi-user.target