Bump version: 1.6.1.2-e81e-dirty → 1.6.2

Change-Id: Iaa88c0003bc6cf70163a8894836f7228d5bd6bfa
doc/examples: fix missing config files in release tarballs
2025-11-03 05:33:16 +00:00 · 2024-05-08 10:04:44 +02:00 · 2024-05-08 09:58:17 +02:00 · 2024-05-08 09:57:33 +02:00 · 2023-11-09 15:25:47 +01:00 · 2023-11-09 15:12:20 +01:00
7 changed files with 39 additions and 2 deletions
--- a/Transceiver52M/device/bladerf/bladerf.cpp
+++ b/Transceiver52M/device/bladerf/bladerf.cpp
@@ -279,6 +279,7 @@ int blade_device::open()

 	dev_type = blade_dev_type::BLADE2;
 	tx_window = TX_WINDOW_FIXED;
+	update_band_dev(dev_key(dev_type, tx_sps, rx_sps));

 	struct bladerf_devinfo info;
 	bladerf_get_devinfo(dev, &info);
--- a/Transceiver52M/device/common/bandmanager.h
+++ b/Transceiver52M/device/common/bandmanager.h
@@ -34,7 +34,7 @@ class band_manager {
 	using powerkeyt = typename powermapt::key_type;
 	using powermappedt = typename powermapt::mapped_type;
 	using devkeyt = typename devmapt::key_type;
-	const devkeyt &m_dev_type;
+	devkeyt m_dev_type;
 	const powermapt &m_power_map;
 	const devmapt &m_dev_map;
 	powerkeyt m_fallback;
@@ -102,6 +102,10 @@ class band_manager {
 		band_ass_curr_sess = false;
 	}

+	void update_band_dev(devkeyt dev_type) {
+		m_dev_type = dev_type;
+	}
+
 	void get_dev_band_desc(powermappedt &desc)
 	{
 		if (m_band == 0) {
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -245,6 +245,7 @@ int LMSDevice::open()

 	m_dev_type = parse_dev_type(m_lms_dev);
 	dev_desc = dev_param_map.at(m_dev_type);
+	update_band_dev(m_dev_type);

 	if ((cfg->clock_ref != REF_EXTERNAL) && (cfg->clock_ref != REF_INTERNAL)) {
 		LOGC(DDEV, ERROR) << "Invalid reference type";
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -530,6 +530,8 @@ int uhd_device::open()
 	if (!parse_dev_type())
 		return -1;

+	update_band_dev(dev_key(dev_type, tx_sps, rx_sps));
+
 	if ((dev_type == E3XX) && !uhd_e3xx_version_chk()) {
 		LOGC(DDEV, ALERT) << "E3XX requires UHD 003.009.000 or greater";
 		return -1;
--- a/contrib/systemd/osmo-trx-uhd.service
+++ b/contrib/systemd/osmo-trx-uhd.service
@@ -8,6 +8,7 @@ Type=simple
 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:
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+osmo-trx (1.6.2) unstable; urgency=medium
+
+  [ Harald Welte ]
+  * osmo-trx-uhd: Make sure HOME environment variable is set
+
+  [ Vadim Yanitskiy ]
+  * doc/examples: fix missing config files in release tarballs
+
+ -- Oliver Smith <osmith@sysmocom.de>  Wed, 08 May 2024 10:04:43 +0200
+
+osmo-trx (1.6.1) unstable; urgency=medium
+
+  [ Eric Wild ]
+  * devices: fix wrong gain to power mapping
+
+ -- Eric Wild <ewild@sysmocom.de>  Thu, 09 Nov 2023 14:16:21 +0200
+
 osmo-trx (1.6.0) unstable; urgency=medium

  [ Vadim Yanitskiy ]
--- 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 @@ OSMOCONF_FILES += osmo-trx-ipc/osmo-trx-ipc.cfg
 endif

 osmoconf_DATA = $(OSMOCONF_FILES)
-EXTRA_DIST = $(OSMOCONF_FILES)

 CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,'
Author	SHA1	Message	Date
Oliver Smith	e528ce4c70	Bump version: 1.6.1.2-e81e-dirty → 1.6.2 Change-Id: Iaa88c0003bc6cf70163a8894836f7228d5bd6bfa	2024-05-08 10:04:44 +02:00
Vadim Yanitskiy	e81e5bce9f	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 `a2d76f1d2f`)	2024-05-08 09:58:17 +02:00
Harald Welte	2ccf2caad6	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 `6ee9dccddb`)	2024-05-08 09:57:33 +02:00
Eric Wild	9269aaa9cb	Bump version: 1.6.0 → 1.6.1 Change-Id: I345ba6569ae0765b3d33e4024d07fc5d925bdf80	2023-11-09 15:25:47 +01:00
Eric	f97c53bc9c	devices: fix wrong gain to power mapping The dev type was set too early, but the actual dev is only being discovered during open, so update it. This broke the gain to power mapping by defaulting to a wrong device. Change-Id: I1dda6023ca6f15bc063c3dfbc704db2410ff7c98	2023-11-09 15:12:20 +01:00