osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36723?usp=email )
Change subject: contrib: remove rpm spec file
......................................................................
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: Ie08c37c7525e039701f764ac1db18c332197cb9f
---
M Makefile.am
M configure.ac
D contrib/libosmo-abis.spec.in
3 files changed, 11 insertions(+), 156 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/23/36723/1
diff --git a/Makefile.am b/Makefile.am
index 22ecc50..5cab5d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,6 @@
EXTRA_DIST = \
.version \
README.md \
- contrib/libosmo-abis.spec.in \
debian \
git-version-gen \
$(NULL)
diff --git a/configure.ac b/configure.ac
index 5097c93..a4f2ef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,4 +184,3 @@
src/Makefile
tests/Makefile
Makefile
- contrib/libosmo-abis.spec)
diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in
deleted file mode 100644
index ce64562..0000000
--- a/contrib/libosmo-abis.spec.in
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# spec file for package libosmo-abis
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# 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: libosmo-abis
-Version: @VERSION@
-Release: 0
-Summary: Osmocom library for A-bis interface between BTS and BSC
-License: AGPL-3.0-or-later AND GPL-2.0-or-later
-Group: Productivity/Telephony/Utilities
-Url: https://osmocom.org/projects/libosmo-abis/wiki/Libosmo-abis
-
-Source: %name-%version.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: automake >= 1.6
-#BuildRequires: dahdi-linux-devel
-BuildRequires: libtool >= 2
-BuildRequires: pkgconfig >= 0.20
-BuildRequires: xz
-BuildRequires: pkgconfig(libosmocore) >= 1.9.0
-BuildRequires: pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires: pkgconfig(libosmovty) >= 1.9.0
-BuildRequires: pkgconfig(libosmocodec) >= 1.9.0
-BuildRequires: pkgconfig(ortp) >= 0.22.0
-BuildRequires: pkgconfig(talloc)
-
-%description
-In GSM, A-bis is a BSS-internal interface link between the BTS and
-BSC. This interface allows control of the radio equipment and radio
-frequency allocation in the BTS.
-
-%package -n libosmoabis13
-Summary: Osmocom GSM A-bis interface library
-License: AGPL-3.0-or-later
-Group: System/Libraries
-
-%description -n libosmoabis13
-In the GSM system architecture, A-bis is a Base Station
-System-internal interface linking the Base Transceiver Stations (BTS)
-and Base Station Controller (BSC). This interface allows control of
-the radio equipment and radio frequency allocation in the BTS.
-
-This library contains common/shared code regarding this A-bis
-interface. It also implements drivers for mISDN and DAHDI-based E1
-cards, as well as some A-bis/IP dialects.
-
-%package -n libosmoabis-devel
-Summary: Development files for the Osmocom GSM A-bis library
-License: AGPL-3.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmoabis13 = %version
-Requires: libosmocore-devel >= 1.9.0
-Requires: libosmogsm-devel >= 1.9.0
-
-%description -n libosmoabis-devel
-This library contains common/shared code regarding the GSM A-bis
-interface. It also implements drivers for mISDN and DAHDI-based E1
-cards, as well as some A-bis/IP dialects.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmoabis.
-
-%package -n libosmotrau2
-Summary: Osmocom GSM TRAU (E1/RTP) library
-License: GPL-2.0-or-later
-Group: System/Libraries
-
-%description -n libosmotrau2
-This library implements the Transcoder and Rate Adaptation Unit (TRAU) for
-GSM systems.
-The TRAU enables the use of lower rates (32, 16 or 8 kbps) over the
-A-bis interface instead of the 64 kbps ISDN rate for which the Mobile
-Switching Center (MSC) is designed.
-
-%package -n libosmotrau-devel
-Summary: Development files for the Osmocom TRAU (E1/RTP) library
-License: GPL-2.0-or-later
-Group: Development/Libraries/C and C++
-Requires: libosmotrau2 = %version
-
-%description -n libosmotrau-devel
-This library implements the Transcoder and Rate Adaptation Unit
-(TRAU) for GSM systems.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmotrau.
-
-%prep
-%setup -q
-
-%build
-echo "%version" >.tarball-version
-autoreconf -fiv
-# FIXME: Compiler warnings with ortp 0.24.2 result in hard-errors during rpm-postbuild-checks - should be fixed upstream
-%if 0%{?sle_version}
-export CFLAGS='%{optflags} -Wno-int-conversion'
-%endif
-%configure \
- --enable-shared \
- --disable-static \
- --disable-dahdi \
- --includedir="%_includedir/%name"
-make %{?_smp_mflags}
-
-%install
-b="%buildroot"
-make %{?_smp_mflags} install DESTDIR="$b"
-find "$b/%_libdir" -type f -name "*.la" -delete
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%post -n libosmoabis13 -p /sbin/ldconfig
-%postun -n libosmoabis13 -p /sbin/ldconfig
-%post -n libosmotrau2 -p /sbin/ldconfig
-%postun -n libosmotrau2 -p /sbin/ldconfig
-
-%files -n libosmoabis13
-%defattr(-,root,root)
-%_libdir/libosmoabis.so.13*
-
-%files -n libosmoabis-devel
-%defattr(-,root,root)
-%doc COPYING
-%dir %_includedir/%name
-%dir %_includedir/%name/osmocom
-%_includedir/%name/osmocom/abis/
-%_libdir/libosmoabis.so
-%_libdir/pkgconfig/libosmoabis.pc
-
-%files -n libosmotrau2
-%defattr(-,root,root)
-%_libdir/libosmotrau.so.2*
-
-%files -n libosmotrau-devel
-%defattr(-,root,root)
-%doc COPYING
-%dir %_includedir/%name
-%dir %_includedir/%name/osmocom
-%_includedir/%name/osmocom/trau
-%_libdir/libosmotrau.so
-%_libdir/pkgconfig/libosmotrau.pc
-
-%changelog
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36723?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: Ie08c37c7525e039701f764ac1db18c332197cb9f
Gerrit-Change-Number: 36723
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libasn1c/+/36721?usp=email )
Change subject: contrib: remove rpm spec file
......................................................................
contrib: remove rpm spec file
Related: https://osmocom.org/news/255
Related: OS#6446
Change-Id: I320f56a3d60143c0da1b7d8dc8e206f0d5b0210e
---
M configure.ac
D contrib/libasn1c.spec.in
2 files changed, 11 insertions(+), 95 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/21/36721/1
diff --git a/configure.ac b/configure.ac
index 6ba1d37..96e5305 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,4 +81,3 @@
include/Makefile
include/asn1c/Makefile
Makefile
- contrib/libasn1c.spec)
diff --git a/contrib/libasn1c.spec.in b/contrib/libasn1c.spec.in
deleted file mode 100644
index 59098c3..0000000
--- a/contrib/libasn1c.spec.in
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# spec file for package libasn1c
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# 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: libasn1c
-Version: @VERSION@
-Release: 0
-Summary: Osmocon ASN.1 decoder and encoder library
-License: BSD-2-Clause
-Group: Development/Libraries/C and C++
-Url: http://openbsc.osmocom.org/trac/
-
-Source: %name-%version.tar.xz
-BuildRequires: libtool >= 2
-BuildRequires: pkg-config
-BuildRequires: xz
-BuildRequires: pkgconfig(libosmocore) >= 0.1.13
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-%description
-Lev Walkins's asn1c runtime, as a shared library and with
-modifications for Osmocom.
-
-Compiles ASN.1 data structures into C source structures that can be
-simply (un)marshalled from and to: BER, DER, CER, BASIC-XER, CXER,
-EXTENDED-XER, PER.
-
-%package -n libasn1c1
-Summary: Osmocon ASN.1 decoder and encoder library
-Group: System/Libraries
-
-%description -n libasn1c1
-Lev Walkins's asn1c runtime, as a shared library and with
-modifications for Osmocom.
-
-Compiles ASN.1 data structures into C source structures that can be
-simply (un)marshalled from and to: BER, DER, CER, BASIC-XER, CXER,
-EXTENDED-XER, PER.
-
-%package -n libasn1c-devel
-Summary: Development files for libasn1c, Osmocom's ASN.1 decoder and encoder library
-Group: Development/Libraries/C and C++
-Requires: libasn1c1 = %version
-Requires: libtalloc-devel
-
-%description -n libasn1c-devel
-Compiles ASN.1 data structures into C source structures that can be
-simply (un)marshalled from and to: BER, DER, CER, BASIC-XER, CXER,
-EXTENDED-XER, PER.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libasn1c.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fi
-%configure --disable-static
-make %{?_smp_mflags}
-
-%install
-%make_install
-find "%buildroot/%_libdir" -type f -name "*.la" -delete
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%post -n libasn1c1 -p /sbin/ldconfig
-%postun -n libasn1c1 -p /sbin/ldconfig
-
-%files -n libasn1c1
-%defattr(-,root,root)
-%_libdir/libasn1c.so.1*
-
-%files -n libasn1c-devel
-%defattr(-,root,root)
-%doc COPYING
-%_includedir/asn1c/
-%_libdir/pkgconfig/*.pc
-%_libdir/libasn1c.so
-
-%changelog
--
To view, visit https://gerrit.osmocom.org/c/libasn1c/+/36721?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libasn1c
Gerrit-Branch: master
Gerrit-Change-Id: I320f56a3d60143c0da1b7d8dc8e206f0d5b0210e
Gerrit-Change-Number: 36721
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36667?usp=email )
Change subject: ansible/setup-jenkins: install rsync
......................................................................
ansible/setup-jenkins: install rsync
After recent refactoring of the gerrit-binpkgs job, rsync is now
requried on the jenkins nodes. It was installed on the ones where I
tested, but not on all of them.
Fixes: b2e12851 ("OBS: move gerrit-binpkgs logic to separate script")
Change-Id: Ic8ffd61fc2c89574085e9c3abbceb554f3c5da6a
---
M ansible/setup-jenkins-slave.yml
1 file changed, 15 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml
index 5813b40..03afe65 100644
--- a/ansible/setup-jenkins-slave.yml
+++ b/ansible/setup-jenkins-slave.yml
@@ -12,6 +12,7 @@
- tmux
- screen
- ca-certificates
+ - rsync
cache_valid_time: 3600
update_cache: yes
roles:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36667?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ic8ffd61fc2c89574085e9c3abbceb554f3c5da6a
Gerrit-Change-Number: 36667
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36660?usp=email )
Change subject: .deb/.rpm: various fixes related to non-root
......................................................................
.deb/.rpm: various fixes related to non-root
* Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of
relying on systemd to do it when the service starts up. This does not
work with the systemd versions in debian 10 and almalinux 8.
* deb: Use "useradd" instead of the interactive "adduser" perl script
from Debian. This makes it consistent with how we do it in rpm, and
avoids the dependency on "adduser".
* deb: Consistently use tabs through the file, instead of mixing tabs
and spaces.
* deb: Remove support for the "dpkg-statoverride --list" logic. This
seems to be a rather obscure feature to override permissions for
certain files or directories, for which it does not seem to be a good
idea to make the postinst script less maintainable. Something similar
can be achieved by using your own Osmocom config file in a different
path with different permissions.
Related: OS#4107
Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73
---
M contrib/osmo-hnbgw.spec.in
M debian/control
M debian/postinst
3 files changed, 50 insertions(+), 32 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/contrib/osmo-hnbgw.spec.in b/contrib/osmo-hnbgw.spec.in
index 2b98da2..414a4d5 100644
--- a/contrib/osmo-hnbgw.spec.in
+++ b/contrib/osmo-hnbgw.spec.in
@@ -94,6 +94,8 @@
chmod 0660 /etc/osmocom/osmo-hnbgw.cfg
chown root:osmocom /etc/osmocom
chmod 2775 /etc/osmocom
+mkdir -p /var/lib/osmocom
+chown -R osmocom:osmocom /var/lib/osmocom
%check
make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
diff --git a/debian/control b/debian/control
index 48d95cf..77737b5 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@
Package: osmo-hnbgw
Architecture: any
Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: osmo-mgw
Description: OsmoHNBGW: Osmocom Home Node B Gateway
diff --git a/debian/postinst b/debian/postinst
index bdec955..d5bf871 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,37 +1,28 @@
#!/bin/sh -e
-# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions
-# of directories which are not automatically adjusted by systemd from previous (root-owned)
-# install.
-
-# N. B: the user is intentionally NOT removed during package uninstall:
-# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning.
-chperms() {
- # chperms <user> <group> <perms> <file>
- if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then
- if [ -e $4 ]; then
- chown $1:$2 $4
- chmod $3 $4
- fi
- fi
-}
-
case "$1" in
- configure)
- if ! getent passwd osmocom > /dev/null; then
- adduser --quiet \
- --system \
- --group \
- --no-create-home \
- --disabled-password \
- --home /var/lib/osmocom \
- --gecos "Open Source Mobile Communications" \
- osmocom
- fi
-# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners
- chperms osmocom osmocom 0660 /etc/osmocom/osmo-hnbgw.cfg
- chperms root osmocom 2775 /etc/osmocom
+ configure)
+ # Create the osmocom group and user (if it doesn't exist yet)
+ if ! getent group osmocom >/dev/null; then
+ groupadd --system osmocom
+ fi
+ if ! getent passwd osmocom >/dev/null; then
+ useradd \
+ --system \
+ --gid osmocom \
+ --home-dir /var/lib/osmocom \
+ --shell /sbin/nologin \
+ --comment "Open Source Mobile Communications" \
+ osmocom
+ fi
- ;;
+ # Fix permissions of previous (root-owned) install (OS#4107)
+ chown osmocom:osmocom /etc/osmocom/osmo-hnbgw.cfg
+ chmod 0660 /etc/osmocom/osmo-hnbgw.cfg
+ chown root:osmocom /etc/osmocom
+ chmod 2775 /etc/osmocom
+ mkdir -p /var/lib/osmocom
+ chown -R osmocom:osmocom /var/lib/osmocom
+ ;;
esac
# dh_installdeb(1) will replace this with shell code automatically
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36660?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73
Gerrit-Change-Number: 36660
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36660?usp=email )
Change subject: .deb/.rpm: various fixes related to non-root
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36660?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I6dd0205fb65d4ad5a79821c111865e67fb293a73
Gerrit-Change-Number: 36660
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 08 May 2024 12:02:38 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36714?usp=email )
Change subject: osmo-trx-uhd: Make sure HOME environment variable is set
......................................................................
osmo-trx-uhd: Make sure HOME environment variable is set
It turns out that uhd versions >= 4.0.0.0 *require* that either the
HOME or the XDG_CONFIG_HOME variables are set, and otherwise will
terminate the program.
Change-Id: I1816013c507da28719590f063da0a397da656a10
Closes: OS#6269
(cherry picked from commit 6ee9dccddb916e44b6bb3e2c967d8a37078206b4)
---
M contrib/systemd/osmo-trx-uhd.service
1 file changed, 16 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
diff --git a/contrib/systemd/osmo-trx-uhd.service b/contrib/systemd/osmo-trx-uhd.service
index 34ba74a..6c5c2de 100644
--- a/contrib/systemd/osmo-trx-uhd.service
+++ b/contrib/systemd/osmo-trx-uhd.service
@@ -8,6 +8,7 @@
Restart=always
StateDirectory=osmocom
WorkingDirectory=%S/osmocom
+Environment=HOME=%h
ExecStart=/usr/bin/osmo-trx-uhd -C /etc/osmocom/osmo-trx-uhd.cfg
RestartSec=2
# CPU scheduling policy:
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36714?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: osmith/1.6.2
Gerrit-Change-Id: I1816013c507da28719590f063da0a397da656a10
Gerrit-Change-Number: 36714
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>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36715?usp=email )
Change subject: doc/examples: fix missing config files in release tarballs
......................................................................
doc/examples: fix missing config files in release tarballs
All config file examples must be listed in EXTRA_DIST unconditionally.
Adding them conditionally results in incomplete release tarballs,
containing only some '*.cfg' files and failing to build.
Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69
Related: OS#6349
(cherry picked from commit a2d76f1d2fe7a1b162fe183695fb479b13c27aac)
---
M doc/examples/Makefile.am
1 file changed, 27 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 0b06130..ac87457 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,3 +1,15 @@
+# all config examples must be listed here unconditionally, so that
+# all of them end up in the release tarball (see OS#6349)
+EXTRA_DIST = \
+ osmo-trx-uhd/osmo-trx-limesdr.cfg \
+ osmo-trx-uhd/osmo-trx-usrp_b200.cfg \
+ osmo-trx-uhd/osmo-trx-uhd.cfg \
+ osmo-trx-uhd/osmo-trx-umtrx.cfg \
+ osmo-trx-lms/osmo-trx-limesdr.cfg \
+ osmo-trx-lms/osmo-trx-lms.cfg \
+ osmo-trx-ipc/osmo-trx-ipc.cfg \
+ $(NULL)
+
OSMOCONF_FILES =
osmoconfdir = $(sysconfdir)/osmocom
@@ -19,7 +31,6 @@
endif
osmoconf_DATA = $(OSMOCONF_FILES)
-EXTRA_DIST = $(OSMOCONF_FILES)
CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,'
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36715?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: osmith/1.6.2
Gerrit-Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69
Gerrit-Change-Number: 36715
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>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged