Changes of Revision 189

View file
osmo-trx.spec Changed
​x
 
1
@@ -13,14 +13,14 @@
2
 # published by the Open Source Initiative.
3
4
 Name:           osmo-trx
5
-Requires: osmocom-nightly = 202212280006
6
-Version: 1.4.1.23.fdcc.202212280006
7
+Requires: osmocom-nightly = 202212290006
8
+Version: 1.4.1.27.d0c1.202212290006
9
 Release:        0
10
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS
11
 License:        AGPL-3.0-or-later
12
 Group:          Productivity/Telephony/Servers
13
 URL:            https://osmocom.org/projects/osmotrx
14
-Source: osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz
15
+Source: osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz
16
 Source1: rpmlintrc
17
 BuildRequires:  autoconf
18
 BuildRequires:  automake
19
@@ -69,7 +69,7 @@
20
 generations of mobile phone networks. (post-2G/GSM)
21
22
 %package uhd
23
-Requires: osmocom-nightly = 202212280006
24
+Requires: osmocom-nightly = 202212290006
25
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (UHD)
26
 Group:          Productivity/Telephony/Servers
27
 Requires:       uhd-firmware
28
@@ -92,7 +92,7 @@
29
30
 %if ! 0%{?centos_ver}
31
 %package usrp1
32
-Requires: osmocom-nightly = 202212280006
33
+Requires: osmocom-nightly = 202212290006
34
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)
35
 Group:          Productivity/Telephony/Servers
36
37
@@ -113,7 +113,7 @@
38
 generations of mobile phone networks. (post-2G/GSM)
39
40
 %package lms
41
-Requires: osmocom-nightly = 202212280006
42
+Requires: osmocom-nightly = 202212290006
43
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)
44
 Group:          Productivity/Telephony/Servers
45
46
@@ -135,7 +135,7 @@
47
 %endif
48
49
 %package ipc
50
-Requires: osmocom-nightly = 202212280006
51
+Requires: osmocom-nightly = 202212290006
52
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (IPC)
53
 Group:          Productivity/Telephony/Servers
54
55
@@ -156,7 +156,7 @@
56
 generations of mobile phone networks. (post-2G/GSM)
57
58
 %package ipc-test
59
-Requires: osmocom-nightly = 202212280006
60
+Requires: osmocom-nightly = 202212290006
61
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (IPC) driver test utility
62
 Group:          Productivity/Telephony/Servers
63
64
​
View file
osmo-trx_1.4.1.23.fdcc.202212280006.dsc -> osmo-trx_1.4.1.27.d0c1.202212290006.dsc Changed
22
 
1
@@ -2,7 +2,7 @@
2
 Source: osmo-trx
3
 Binary: osmo-trx, osmo-trx-dbg, osmo-trx-uhd, osmo-trx-usrp1, osmo-trx-lms, osmo-trx-ipc, osmo-trx-doc
4
 Architecture: any all
5
-Version: 1.4.1.23.fdcc.202212280006
6
+Version: 1.4.1.27.d0c1.202212290006
7
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
8
 Homepage: https://projects.osmocom.org/projects/osmotrx
9
 Standards-Version: 3.9.6
10
@@ -18,8 +18,8 @@
11
  osmo-trx-uhd deb net optional arch=any
12
  osmo-trx-usrp1 deb net optional arch=any
13
 Checksums-Sha1:
14
- a18941bcf15d1b597ddec40b7ca81df70612ba5c 1369492 osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz
15
+ 4daa8503ad9b4609483cad846924642d74e58c35 1366684 osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz
16
 Checksums-Sha256:
17
- b8d7152def8e04dd2a061d8a549ead135e7c45415548e9c00080036ea8dea85e 1369492 osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz
18
+ eb2696084644314b3f9453d139a1e016d2a75bf17bdef54568b9a908b19f1d66 1366684 osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz
19
 Files:
20
- 06744b5882259041dd864758f80760ae 1369492 osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz
21
+ f7bfe56e197b99048565b37ef997d77e 1366684 osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz
22
​
View file
osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz/.tarball-version -> osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-1.4.1.23-fdcc.202212280006
3
+1.4.1.27-d0c1.202212290006
4
​
View file
osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz/Makefile.am -> osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz/Makefile.am Changed
10
 
1
@@ -29,7 +29,7 @@
2
 SUBDIRS =
3
4
 if ENABLE_MS_TRX
5
-SUBDIRS += osmocom-bb/src/host/trxcon
6
+SUBDIRS += $(LIBTRXCON_DIR)
7
 endif
8
9
 # Order must be preserved
10
​
View file
osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz/Transceiver52M/ms/ms_upper.cpp -> osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz/Transceiver52M/ms/ms_upper.cpp Changed
12
 
1
@@ -449,8 +449,8 @@
2
3
        // we know the flag is atomic and it prevents the trxcon cb handlers from writing
4
        // to the queues, so submit some trash to unblock the threads & exit
5
-       trxcon::trxcon_phyif_cmd cmd;
6
-       trxcon::internal_q_tx_buf b;
7
+       trxcon::trxcon_phyif_cmd cmd = {};
8
+       trxcon::internal_q_tx_buf b = {};
9
        trxcon::txq.spsc_push(&b);
10
        trxcon::cmdq_to_phy.spsc_push(&cmd);
11
12
​
View file
osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz/configure.ac -> osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz/configure.ac Changed
42
 
1
@@ -209,7 +209,19 @@
2
     PKG_CHECK_MODULES(BLADE, libbladeRF >= 2.0)
3
 )
4
5
-AM_CONDITIONAL(ENABLE_MS_TRX, test "x$with_mstrx" = "xyes")
6
+AC_MSG_CHECKING(whether to enable building MS TRX)
7
+AS_IF(test "x$with_mstrx" = "xyes",
8
+    AC_CONFIG_SUBDIRS(osmocom-bb/src/host/trxcon)
9
+    AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon")
10
+    AC_MSG_RESULT(yes)
11
+,
12
+    # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally,
13
+    # autoconf/automake still requires the directory to be present
14
+    # and thus the submodule to be fetched (even if MS TRX is not needed).
15
+    # Work this around by pointing it to an empty dir.
16
+    AC_SUBST(LIBTRXCON_DIR, "osmocom-bb")
17
+    AC_MSG_RESULT(no)
18
+)
19
20
 AS_IF(test "x$with_singledb" = "xyes",
21
     AC_DEFINE(SINGLEDB, 1, Define to 1 for single daughterboard)
22
@@ -267,6 +279,7 @@
23
 AM_CONDITIONAL(DEVICE_BLADE, test "x$with_bladerf" = "xyes")
24
 AM_CONDITIONAL(ARCH_ARM, test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4" = "xyes")
25
 AM_CONDITIONAL(ARCH_ARM_A15, test "x$with_neon_vfpv4" = "xyes")
26
+AM_CONDITIONAL(ENABLE_MS_TRX, test "x$with_mstrx" = "xyes")
27
28
 PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
29
 PKG_CHECK_MODULES(FFTWF, fftw3f)
30
@@ -334,11 +347,6 @@
31
 AC_MSG_RESULT(CXXFLAGS="$CXXFLAGS")
32
 AC_MSG_RESULT(LDFLAGS="$LDFLAGS")
33
34
-if test "x$with_mstrx" = "xyes"; then
35
-    AC_MSG_NOTICE("Enabling ms-trx...")
36
-    AC_CONFIG_SUBDIRS(osmocom-bb/src/host/trxcon)
37
-fi
38
-
39
40
 dnl Output files
41
 AC_CONFIG_FILES(\
42
​
View file
osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz/contrib/osmo-trx.spec.in -> osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz/contrib/osmo-trx.spec.in Changed
55
 
1
@@ -13,7 +13,7 @@
2
 # published by the Open Source Initiative.
3
4
 Name:           osmo-trx
5
-Requires: osmocom-nightly = 202212280006
6
+Requires: osmocom-nightly = 202212290006
7
 Version:        @VERSION@
8
 Release:        0
9
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS
10
@@ -68,7 +68,7 @@
11
 generations of mobile phone networks. (post-2G/GSM)
12
13
 %package uhd
14
-Requires: osmocom-nightly = 202212280006
15
+Requires: osmocom-nightly = 202212290006
16
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (UHD)
17
 Group:          Productivity/Telephony/Servers
18
 Requires:       uhd-firmware
19
@@ -91,7 +91,7 @@
20
21
 %if ! 0%{?centos_ver}
22
 %package usrp1
23
-Requires: osmocom-nightly = 202212280006
24
+Requires: osmocom-nightly = 202212290006
25
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)
26
 Group:          Productivity/Telephony/Servers
27
28
@@ -112,7 +112,7 @@
29
 generations of mobile phone networks. (post-2G/GSM)
30
31
 %package lms
32
-Requires: osmocom-nightly = 202212280006
33
+Requires: osmocom-nightly = 202212290006
34
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)
35
 Group:          Productivity/Telephony/Servers
36
37
@@ -134,7 +134,7 @@
38
 %endif
39
40
 %package ipc
41
-Requires: osmocom-nightly = 202212280006
42
+Requires: osmocom-nightly = 202212290006
43
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (IPC)
44
 Group:          Productivity/Telephony/Servers
45
46
@@ -155,7 +155,7 @@
47
 generations of mobile phone networks. (post-2G/GSM)
48
49
 %package ipc-test
50
-Requires: osmocom-nightly = 202212280006
51
+Requires: osmocom-nightly = 202212290006
52
 Summary:        SDR transceiver that implements Layer 1 of a GSM BTS (IPC) driver test utility
53
 Group:          Productivity/Telephony/Servers
54
55
​
View file
osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz/debian/changelog -> osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-osmo-trx (1.4.1.23.fdcc.202212280006) unstable; urgency=medium
3
+osmo-trx (1.4.1.27.d0c1.202212290006) unstable; urgency=medium
4
5
   * Automatically generated changelog entry for building the Osmocom nightly feed
6
7
- -- Osmocom OBS scripts <info@osmocom.org>  Wed, 28 Dec 2022 00:08:10 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Thu, 29 Dec 2022 00:08:34 +0000
9
10
 osmo-trx (1.4.1) unstable; urgency=medium
11
12
​
View file
osmo-trx_1.4.1.23.fdcc.202212280006.tar.xz/debian/control -> osmo-trx_1.4.1.27.d0c1.202212290006.tar.xz/debian/control Changed
62
 
1
@@ -22,7 +22,7 @@
2
 Homepage: https://projects.osmocom.org/projects/osmotrx
3
4
 Package: osmo-trx
5
-Depends: osmocom-nightly (= 202212280006), osmo-trx-uhd
6
+Depends: osmocom-nightly (= 202212290006), osmo-trx-uhd
7
 Architecture: all
8
 Description: Metapackage for osmo-trx-uhd
9
10
@@ -30,13 +30,13 @@
11
 Architecture: any
12
 Section: debug
13
 Priority: extra
14
-Depends: osmocom-nightly (= 202212280006), osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-lms (= ${binary:Version}), osmo-trx-ipc (= ${binary:Version}), ${misc:Depends}
15
+Depends: osmocom-nightly (= 202212290006), osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-lms (= ${binary:Version}), osmo-trx-ipc (= ${binary:Version}), ${misc:Depends}
16
 Description: Debug symbols for the osmo-trx-*
17
  Make debugging possible
18
19
 Package: osmo-trx-uhd
20
 Architecture: any
21
-Depends: osmocom-nightly (= 202212280006), ${shlibs:Depends}, ${misc:Depends}
22
+Depends: osmocom-nightly (= 202212290006), ${shlibs:Depends}, ${misc:Depends}
23
 Description: SDR transceiver that implements Layer 1 of a GSM BTS (UHD)
24
  OsmoTRX is a software-defined radio transceiver that implements the Layer 1
25
  physical layer of a BTS comprising the following 3GPP specifications:
26
@@ -55,7 +55,7 @@
27
28
 Package: osmo-trx-usrp1
29
 Architecture: any
30
-Depends: osmocom-nightly (= 202212280006), ${shlibs:Depends}, ${misc:Depends}
31
+Depends: osmocom-nightly (= 202212290006), ${shlibs:Depends}, ${misc:Depends}
32
 Description: SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)
33
  OsmoTRX is a software-defined radio transceiver that implements the Layer 1
34
  physical layer of a BTS comprising the following 3GPP specifications:
35
@@ -74,7 +74,7 @@
36
37
 Package: osmo-trx-lms
38
 Architecture: any
39
-Depends: osmocom-nightly (= 202212280006), ${shlibs:Depends}, ${misc:Depends}
40
+Depends: osmocom-nightly (= 202212290006), ${shlibs:Depends}, ${misc:Depends}
41
 Description: SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite)
42
  OsmoTRX is a software-defined radio transceiver that implements the Layer 1
43
  physical layer of a BTS comprising the following 3GPP specifications:
44
@@ -93,7 +93,7 @@
45
46
 Package: osmo-trx-ipc
47
 Architecture: any
48
-Depends: osmocom-nightly (= 202212280006), ${shlibs:Depends}, ${misc:Depends}
49
+Depends: osmocom-nightly (= 202212290006), ${shlibs:Depends}, ${misc:Depends}
50
 Description: SDR transceiver that implements Layer 1 of a GSM BTS (generic IPC)
51
  OsmoTRX is a software-defined radio transceiver that implements the Layer 1
52
  physical layer of a BTS comprising the following 3GPP specifications:
53
@@ -114,7 +114,7 @@
54
 Architecture: all
55
 Section: doc
56
 Priority: optional
57
-Depends: osmocom-nightly (= 202212280006), ${misc:Depends}
58
+Depends: osmocom-nightly (= 202212290006), ${misc:Depends}
59
 Description: ${misc:Package} PDF documentation
60
  Various manuals: user manual, VTY reference manual and/or
61
  protocol/interface manuals.
62
​
Locations
Help
Contact