paulmataruso/osmo-cbc
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-cbc.git synced 2025-11-06 15:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: paulmataruso:0.4.0
Branches Tags
paulmataruso:master paulmataruso:pespin/fix
paulmataruso:0.5.1 paulmataruso:0.5.0 paulmataruso:0.4.2 paulmataruso:0.4.1 paulmataruso:0.4.0 paulmataruso:0.3.0 paulmataruso:0.2.3 paulmataruso:0.2.2 paulmataruso:0.2.1 paulmataruso:0.2.0 paulmataruso:0.1.0
...
compare: paulmataruso:0.4.1
Branches Tags
paulmataruso:master paulmataruso:pespin/fix
paulmataruso:0.5.1 paulmataruso:0.5.0 paulmataruso:0.4.2 paulmataruso:0.4.1 paulmataruso:0.4.0 paulmataruso:0.3.0 paulmataruso:0.2.3 paulmataruso:0.2.2 paulmataruso:0.2.1 paulmataruso:0.2.0 paulmataruso:0.1.0

6 Commits
0.4.0 ... 0.4.1

Author SHA1 Message Date
Pau Espin Pedrol
43439c785f Bump version: 0.4.0.5-1d9d-dirty → 0.4.1 
Change-Id: I78551978b0c5b3906cc46c119c6c9a6229d1e8e7
 2023-02-07 17:39:55 +01:00
arehbein
1d9d13ce6b osmo-cbc: Transition to use of 'telnet_init_default' 
Related: OS#5809
Change-Id: I68f268cccc1ae00004aa63dbbf6708a581a1e705
 2022-12-19 22:34:39 +01:00
Max
6e64d1079f Set working directory in systemd service file 
By default systemd will execute service with root directory (or home directory for user instance) which might result in
attempts to create files in unexpected place. Let's set it to 'osmocom' subdir of state directory (/var/lib for system instance) instead.

Related: OS#4821
Change-Id: I033029a6b1f2bfa259cec74b139a33b0897fcd98
 2022-08-30 20:02:12 +07:00
Vadim Yanitskiy
d5ea7f765e contrib/jenkins.sh: fix 'publish' target 
Executing 'maintainer-clean' before 'publish' makes the later fail:

  + make -C /build/doc/manuals publish
  make: Entering directory '/build/doc/manuals'
  make: Leaving directory '/build/doc/manuals'
  make: *** No rule to make target 'publish'.  Stop.

Execute 'maintainer-clean' after 'publish', like other projects do.

Change-Id: I16cc855ee05726938e1542f481488364c5e47a95
Fixes: I2fe0de9bcb372333da1e5c81712a511cda34858c
 2022-08-30 00:08:17 +07:00
Vadim Yanitskiy
8d70759ab7 contrib/jenkins.sh: execute 'distcheck' with $PARALLEL_MAKE 
Change-Id: I895c0dbfd56613a5f2f77a338e64e1cde3017d11
 2022-08-28 17:36:37 +07:00
Vadim Yanitskiy
8f15c2c23d contrib/jenkins.sh: also execute maintainer-clean target 
Change-Id: I2fe0de9bcb372333da1e5c81712a511cda34858c
 2022-08-28 17:23:27 +07:00
7 changed files with 30 additions and 12 deletions
Expand all files Collapse all files

8
configure.ac
View File

@@ -31,10 +31,10 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
fi fi
PKG_PROG_PKG_CONFIG([0.20]) PKG_PROG_PKG_CONFIG([0.20])
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.7.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.8.0)
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.8.0)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.2.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.3.0)
PKG_CHECK_MODULES(ULFIUS, libulfius) PKG_CHECK_MODULES(ULFIUS, libulfius)
PKG_CHECK_MODULES(JANSSON, jansson) PKG_CHECK_MODULES(JANSSON, jansson)
PKG_CHECK_MODULES(ORCANIA, liborcania) PKG_CHECK_MODULES(ORCANIA, liborcania)

3
contrib/jenkins.sh
View File

@@ -51,11 +51,12 @@ autoreconf --install --force
./configure --enable-sanitize --enable-werror --enable-external-tests $CONFIG ./configure --enable-sanitize --enable-werror --enable-external-tests $CONFIG
$MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE
DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests $CONFIG" \ DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests $CONFIG" \
$MAKE distcheck \ $MAKE $PARALLEL_MAKE distcheck \
|| cat-testlogs.sh || cat-testlogs.sh
if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
make -C "$base/doc/manuals" publish make -C "$base/doc/manuals" publish
fi fi
$MAKE $PARALLEL_MAKE maintainer-clean
osmo-clean-workspace.sh osmo-clean-workspace.sh

8
contrib/osmo-cbc.spec.in
View File

@@ -31,10 +31,10 @@ BuildRequires: pkgconfig >= 0.20
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
%endif %endif
BuildRequires: pkgconfig(libsctp) BuildRequires: pkgconfig(libsctp)
BuildRequires: pkgconfig(libosmocore) >= 1.7.0 BuildRequires: pkgconfig(libosmocore) >= 1.8.0
BuildRequires: pkgconfig(libosmogsm) >= 1.7.0 BuildRequires: pkgconfig(libosmogsm) >= 1.8.0
BuildRequires: pkgconfig(libosmovty) >= 1.7.0 BuildRequires: pkgconfig(libosmovty) >= 1.8.0
BuildRequires: pkgconfig(libosmo-netif) >= 1.2.0 BuildRequires: pkgconfig(libosmo-netif) >= 1.3.0
BuildRequires: pkgconfig(talloc) BuildRequires: pkgconfig(talloc)
BuildRequires: pkgconfig(libulfius) BuildRequires: pkgconfig(libulfius)
%{?systemd_requires} %{?systemd_requires}

2
contrib/systemd/osmo-cbc.service
View File

@@ -3,6 +3,8 @@ Description=Osmocom CBC (Cell Broadcasting Centre)
[Service] [Service]
Type=simple Type=simple
StateDirectory=osmocom
WorkingDirectory=%S/osmocom
Restart=always Restart=always
ExecStart=/usr/bin/osmo-cbc -c /etc/osmocom/osmo-cbc.cfg ExecStart=/usr/bin/osmo-cbc -c /etc/osmocom/osmo-cbc.cfg
RestartSec=2 RestartSec=2

15
debian/changelog vendored
View File

@@ -1,3 +1,18 @@
osmo-cbc (0.4.1) unstable; urgency=medium
[ Vadim Yanitskiy ]
* contrib/jenkins.sh: also execute maintainer-clean target
* contrib/jenkins.sh: execute 'distcheck' with $PARALLEL_MAKE
* contrib/jenkins.sh: fix 'publish' target
[ Max ]
* Set working directory in systemd service file
[ arehbein ]
* osmo-cbc: Transition to use of 'telnet_init_default'
-- Pau Espin Pedrol <pespin@sysmocom.de> Tue, 07 Feb 2023 17:39:54 +0100
osmo-cbc (0.4.0) unstable; urgency=medium osmo-cbc (0.4.0) unstable; urgency=medium
[ Pau Espin Pedrol ] [ Pau Espin Pedrol ]

4
debian/control vendored
View File

@@ -11,8 +11,8 @@ Build-Depends: debhelper (>=9),
pkg-config, pkg-config,
python3-minimal, python3-minimal,
libtalloc-dev, libtalloc-dev,
libosmocore-dev (>= 1.7.0), libosmocore-dev (>= 1.8.0),
libosmo-netif-dev (>= 1.2.0), libosmo-netif-dev (>= 1.3.0),
libulfius-dev, libulfius-dev,
libjansson-dev, libjansson-dev,
libsctp-dev, libsctp-dev,

2
src/cbc_main.c
View File

@@ -288,7 +288,7 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
rc = telnet_init_dynif(tall_cbc_ctx, NULL, vty_get_bind_addr(), OSMO_VTY_PORT_CBC); rc = telnet_init_default(tall_cbc_ctx, NULL, OSMO_VTY_PORT_CBC);
if (rc < 0) { if (rc < 0) {
perror("Error binding VTY port"); perror("Error binding VTY port");
exit(1); exit(1);