Commit Graph

350 Commits

Author SHA1 Message Date
Pau Espin 44c212e3dc Bump version: → 3.4.8
Change-Id: I0b8e5a5a62a229b60b0133541efbaad616093a23
2023-09-12 12:28:52 +02:00
Pau Espin 573075bfed Fix compilation with newer sdcc
Since recent system upgrade which pulled in sdcc 4.3.0, build fails with
following error:
/git/libusrp/firmware/include/fx2regs.h:324: syntax error: token -> '+' ; column 26

It seems newer sdcc doesn't like having sums directly in there. Using
parenthesis around the expression fixes the problem.

Related: OS#6157
Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea
2023-08-29 14:02:56 +02:00
Pau Espin d1d39c65a3 cosmetic: fx2regs.h: Fix trailing whitespace
Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db
2023-08-29 14:02:56 +02:00
Pau Espin 8f6929276e linter: Don't check header files
None of those follow osmocom coding style.

Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9
2023-08-29 14:02:50 +02:00
Oliver Smith 312f964ed2 debian/rules: don't build in parallel
With upgrading the debhelper compat level to v10, parallel building was
enabled by default. But this doesn't work reliably with libusrp, so
disable it. On OBS, out of 18 builds, two failed.

Related: OS#3970
Change-Id: Ic23778320a44ec6ee2fef499216eb8a0c52603d2
2023-04-28 10:55:52 +02:00
Oliver Smith f75863f235 Cosmetic: contrib/ fix typo
Change-Id: Ic0459bd5585fbcf3af785dfda167811a07107edb
2023-04-28 10:50:07 +02:00
Oliver Smith 64dd85f770 debian: set compat level to 10
Related: OS#5958
Change-Id: If42ed8736658d23c99fdd8cbbe511819b1568cbe
2023-04-25 16:48:19 +02:00
Oliver Smith fe31e2b363 configure: abort if SDCC is not found
Change RESULT to ERROR so the configure script stops when SDCC is not
found. Otherwise it tries to use "no":

  no -I../../firmware/include  -c delay.c -o delay.rel
  /bin/bash: line 1: no: command not found

Change-Id: Id8defcc72a35e469a1eeb59919d66cc7cf2f6ac8
2023-02-09 17:19:31 +01:00
Pau Espin 0c86c16936 Bump version: → 3.4.7
Change-Id: I99e104cbcf33eec9f484ff3a8abf7162a1ac821b
2023-02-07 14:00:21 +01:00
Oliver Smith 7f277886ea gitignore: add /.version
Change-Id: I40c6fa0760fb76382432256ba1e3b663628dfa0d
2022-07-11 14:54:26 +02:00
Oliver Smith 789cad2325 host/lib/ fix 'make uninstall'
Fix for:
  /bin/bash: -c: line 11: syntax error near unexpected token `|'
  /bin/bash: -c: line 11: `echo "$py_files" |  | sed '$!N;$!N;$!N;$!N;$!N;$!N;$!N;s/\n/ /g' | sed '$!N;$!N;$!N;$!N;s/\n/ /g' | \'

Fixes: OS#5609
Change-Id: I5c18b5479c86333a478b61c4a50ede69af7d6700
2022-07-11 14:53:58 +02:00
Pau Espin 841a638a62 Bump version: → 3.4.6
Change-Id: I4415a6fc189ffff9ea7d640d28debae70807a242
2021-11-16 11:57:22 +01:00
Harald Welte d40ef8f001 migrate to python3
Let's move to python3, it's 2020 and the conversion seemed
actually rather trivial (famous last words).

Change-Id: Ib1604b36c32630e1360e06567cbd5f63a78df547
2021-11-12 12:52:18 +00:00
Vadim Yanitskiy cdc0ed783c libusb_get_device_list() may return a negative number
Change-Id: Ibf5f88d51c36ff9577f748c004562bd8ed2e96bf
Fixes: CID#240717
2021-10-25 00:33:28 +03:00
Vadim Yanitskiy ae3d54ceeb usrp_prims_common: fix use-after-free in get_proto_filename()
Every time the get_proto_filename() is called, a new instance
of std::string is allocated for the first argument.  When the
function returns, this instance gets deallocated.  Therefore,
the returned user_filename.c_str() points to free()d memory.

Change-Id: Ib0007e9aebd9e77c28531c1ec70c61f1723a2d0d
Fixes: CID#240724
2021-10-25 00:15:39 +03:00
Vadim Yanitskiy 559899621b usrp_standard: fix out-of-bounds read in set_rx_freq()
Change-Id: I3e3ba31e5a68f92a330c5791ee72ad1ffab83da9
Fixes: CID#240737
2021-10-24 23:38:46 +03:00
Oliver Smith b293ceaf0f set -std=gnu11
Change-Id: I9245df7569f0fed936d5e1a1783fc40203cecba1
2021-01-27 17:41:13 +01:00
Harald Welte 815442dc0d Bump version: → 3.4.5
Change-Id: Iaf3545265d8ec28f9b760b55e6170808c35f6ccb
2020-06-13 14:04:03 +02:00
Harald Welte e2c846a6b9 debian/control: Add python as BuildRequires, as edit-gpif uses it
This hopefully should fix the libusrp build errors on OBS for
Debian testing + unstable.

Change-Id: I6525e90b63c442b5ec69b4730e92f576694ea1a2
2020-06-09 07:17:18 +00:00
Oliver Smith 50ce40fe76 EXTRA_DIST: debian, contrib/*
Change-Id: Ic982838b33111c0dd1195cd885bba2228d7bc40e
2020-05-22 13:32:43 +02:00
Oliver Smith 2d98f87ade Makefile.common: LTVERSIONFLAGS: remove -release
Generate the soname from LIBVERSION (initially 1:0:0), instead of VERSION.
This means, we have binary compatibility between each major release
(which we should increase if we ever have a breaking change), instead of
forcing a binary incompatibility for each packaged version (also nightly
packages). This is how we do it in other Osmocom projects, too.

Fix nightly RPM packaging, as we now don't need to add the git commit to
the package name:

[  135s] libusrp.i586: E: shlib-policy-name-error (Badness: 10000) libusrp-3_4_4_4_c46f0
[  135s] Your package contains a single shared library but is not named after its
[  135s] SONAME.

The debian package is already using libusrp1 as package name.

Change-Id: I73b222ea7e2fd0117827f9d6f28b23671068533b
2020-05-20 11:06:51 +02:00
Oliver Smith f96964eea4 contrib: integrate RPM spec
Remove OpenSUSE bug report link, set version to @VERSION@, make it build with
CentOS 8 etc.

Related: OS#4550
Change-Id: I453ff45ec449834dfee298ecc6015e6d54768bea
2020-05-19 15:20:38 +02:00
Oliver Smith 1f6f519b22 contrib: import RPM spec
Copy the RPM spec file from:

Related: OS#4550
Change-Id: I45edbd4ae5bca1194c17452e8fd3538742ca1ef0
2020-05-14 11:36:20 +02:00
Pau Espin 6b18a31738 m4/ax_boost_base.m4: Fix debian multiarch_libsubdir path for arch armv7l
Without this patch, building on an RPI4 ends up with
BOOST_LDFLAGS=-L/usr/lib while libs are actually under
/usr/lib/arm-linux-gnueabihf, and configure will later file during

Change-Id: I7a6b2dca5ced6a6a5232fe78b071dfafdda0b0f3
2020-02-19 15:46:50 +01:00
Pau Espin e4a083b14c m4/ax_boost_base.m4: Update to newest version from autoconf-archive
Fetched from:;a=blob_plain;f=m4/ax_boost_base.m4

Change-Id: Id2753b8d13817d3bfa6cb198b272c60f466b6da6
2020-02-19 15:45:23 +01:00
Pau Espin 45c0f9e8d2 Workaround race conditon in make
Sometimes the jenkins job fails to build. I never have this issue
on my workstation. Disabling PARALLEL_MAKE is osmo-trx (which
requires libusrp build) made libusrp stop failing there, so let's do the
same here.

Change-Id: Iab8eab6d21365e3ee8d018428a707c56cc1b72e5
2019-08-09 14:25:34 +02:00
Pau Espin ae66dcc21b Bump version: → 3.4.4
Change-Id: If47c3a8f03cfd2eaff84359a9a2bfce02f3b9a10
2019-08-08 12:31:57 +02:00
Pau Espin 86462ceb5b Fix UNKNOWN version in make dist
Change-Id: I94b2f2d00d73b62dcdbc85ae15d9b26de5a6f879
2019-08-08 12:27:54 +02:00
Pau Espin 54c983706d debian/rules: Don't delete .tarball-version
No other osmocom project does it.

Change-Id: Ieb3d8070b9a5764bf763fad4fa83f9976df34bd4
2019-08-08 12:20:04 +02:00
Pau Espin 193bb9aadd Bump version: → 3.4.3
Change-Id: I7f3ace74e30aba8609f435e76256badd93fb0220
2019-08-07 12:12:21 +02:00
Pau Espin 14891be1f6 Use git-version-gen
Change-Id: Ib5458af1df08eec82339b4e7f7696b9c390a3078
2019-08-07 12:05:55 +02:00
Pau Espin 3118936c13 Use release helper from libosmocore
for details.

Change-Id: I3aaa768a9c7afda11852521c548352244bf141ac
2019-08-07 12:01:44 +02:00
Pau Espin 5f9f79b030 Remove trailing whitespace
Change-Id: I8b6b8781c95a4930b89e5c5462d322cf04ccda67
2019-08-07 12:01:44 +02:00
Oliver Smith 67dab2ba60 contrib/ run "make {distcheck,maintainer-clean}"
Related: OS#3047
Change-Id: Ic277f37413cb338f4f9bdf4c5fc033d94a2cd5db
2019-07-10 15:28:46 +02:00
Oliver Smith 9aaee8c17b firmware/src/usrp2/ fix "distcheck"
Properly remove lk files to fix the following error during
"make distcheck".

ERROR: files left in build directory after distclean:

Change-Id: I5f1b1f5ad72112ba7212800da7f85846bb6e7187
2019-07-10 15:28:46 +02:00
Alexander Huemer db7fbf8c11 Avoid compiler warning 'dynamic exception specifications are deprecated in C++11 [-Wdeprecated]'
Change-Id: Ie472e6f92944cfe1af7d63cd644879573d080ca2
2019-02-06 21:45:14 +01:00
Alexander Huemer 523993f19d usrp2: firmware: ignore .lk build artifacts
Change-Id: I79cbb834f02dc3f804e5a1476724245407f0eade
2019-02-06 21:36:25 +01:00
Pau Espin 4edd1ab6fb edit-gpif: Fix build for distros with python3 as default
Fix the script so it is python2 and python3 compatible, then let the
distro decide which python version to use.

Change-Id: If805c8167e2cf57ce3d6143dddfd4685ad729142
2019-02-06 18:15:01 +01:00
Pau Espin d20c118fd2 Fix build for distros with python3 as default
The script contains python2-only syntax, so it can only be run with
python2. Make sure to explicitly specify it needs to be run with python2
in order to run it fine on distros where python points to python3.

Change-Id: Ie695c26f1b2a4f84bdc2b67938fe37a4c50681dd
2019-02-06 18:12:22 +01:00
Max bbb6193093 Add config for git-review
Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b
2019-01-24 17:53:48 +01:00
Harald Welte bc019b203f debian: Add 'sdcc' package to BuildDepends
We recently re-introduced building the USRP1 FX2 firmware
using SDCC.  This needs to be listed as requirement for building
the package, otherwise build are failing.

Change-Id: I23ca8d7ad26437f2c971608cd881a6f40e26a887
2019-01-13 10:15:10 +01:00
Harald Welte 0751a53cc5 debian: Make sure the FX2 firmware is packaged
Change-Id: Ide58bb2969a41f5ccb563b7e0ae13e4bf5932127
2019-01-12 09:46:42 +00:00
Harald Welte 820287e108 Re-enable build of usrp FX2 firmware
Back in df354005f3, for some reason
building the USRP1 FX2 firmware was disabled.  Let's re-enable it, as
the FX2 firmware is required as an essential part of USRP1 device
operation.  It's loaded into the FX2 RAM over USB after the initial USB

As the firmware code has meanwhile been ported to a more modern
SDCC dialect (SDCC 3.2 or later, released in 2012), we have to adjust
the required minimum SDCC version.

Change-Id: I66ecc66bca3e8c171d2dd0d15c71186e16e8cc3b
2019-01-12 09:46:42 +00:00
Harald Welte 0934c37850 firmware: Port to more modern SDCC syntax.
SDCC, at least from version 3 onwards, has change the names of special
attributes like "at" or "sfr".  They are now all prefixed with double-

Upstream fx2lib has made that change in commit 3071389d9a868ed553b84809b399008648536fcf
which can be obtained from

Change-Id: I5df64bc3cc09402bdfacec9c256e96135e3688fd
2019-01-12 09:46:42 +00:00
Harald Welte a001479225 firmware: Fix include directory path names
When we forked libusrp from the gnuradio source archive, we moved
around the directories, but failed to adjust the FW_INCLUDES.

Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0
2019-01-12 09:46:42 +00:00
Pau Espin b1ad0157dc debian/rules: Don't overwrite .tarball-version
The .tarball-version file should contain the *source version* uniquely
identifying the git commit, and not the Debian package name.

With there is a correct
.tarball-version file in the .tar.xz of the nightly source packages.

Related: OS#3449
Change-Id: Idb187930d08b9e427ec07b4d27f138c106f69f99
2018-09-17 10:44:20 +02:00
Pau Espin 15bf18f518 build: use correct python version in
AM_PATH_PYTHON is broken, we already dropped it in other osmocom

Change-Id: I17a79464718c9dcf8f4f579fb1871bfac22075e3
2018-04-29 14:38:15 +00:00
Pau Espin 52f0929e62 Add debian directory
Related: OS#3218
Change-Id: I5ff1d76f533b9ac68ab3f2c70ead6b66f4413b4f
2018-04-28 11:07:41 +02:00
Pau Espin 85538b98d0 Makefile.par.gen: Fix .deps directory not present during build
Change-Id: I899cde47bb03ed6f00d431e7d744be6f663ae314
2018-04-27 15:14:25 +02:00
Pau Espin df354005f3 build: Fix make distcheck
Change-Id: I8f71cf91d4cdbe0fdc4e451b89d95437ff800337
2018-04-27 15:14:25 +02:00