diff options
| author | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-07-13 07:13:10 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-07-21 14:29:44 -0500 |
| commit | 8038727d59d5c359721f0b94698a563083464827 (patch) | |
| tree | b4f3a1c34c2a0ea6fd163a5cb33c02ee5d0ab4f6 /host/cmake | |
| parent | de68707dd42b55822c2b1fa19003675d03010982 (diff) | |
| download | uhd-8038727d59d5c359721f0b94698a563083464827.tar.gz uhd-8038727d59d5c359721f0b94698a563083464827.tar.bz2 uhd-8038727d59d5c359721f0b94698a563083464827.zip | |
uhd: Update version, manifest, and changelogs
Recently, we released UHD v4.1.0.1, which addressed some bugs that found
their way into the UHD v4.1.0.0 release. While the changes that
addressed those bugs were made in the master branch, they were
cherry-picked into the UHD-4.1 branch, and the v4.1.0.1 release was made
from that branch. However, the version, manifest, and changelogs were
updated only in the UHD-4.1 branch, not in master. The effect of that is
that the current master (a.k.a. the absolute latest, perhaps unstable,
use-at-your-own-risk code) branch's version, manifest, and changelogs
still reflect the v4.1.0.0 release. Furthermore, the UHD documentation
refers to the manifest file in the master branch as the way to get (at
least) the most recent filesystem and FPGA artifacts. Not updating the
manifest in master renders that documentation inaccurate.
This commit updates those details in master to reflect the latest
v4.1.0.1 release artifacts, and updates the version of master to
4.2.0-git.
Diffstat (limited to 'host/cmake')
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 8 | ||||
| -rw-r--r-- | host/cmake/debian/changelog | 20 |
2 files changed, 25 insertions, 3 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 60430ec90..3a39a40cf 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -15,13 +15,15 @@ find_package(Git QUIET) # - Increment API on API changes # - Increment ABI on ABI changes # - Increment patch for bugfixes and docs +# (but use 'git' for master to represent 'ahead of the latest stable +# release) # - set UHD_VERSION_DEVEL to true for master and development branches ######################################################################## set(UHD_VERSION_MAJOR 4) -set(UHD_VERSION_API 1) +set(UHD_VERSION_API 2) set(UHD_VERSION_ABI 0) -set(UHD_VERSION_PATCH 0) -set(UHD_VERSION_DEVEL FALSE) +set(UHD_VERSION_PATCH git) +set(UHD_VERSION_DEVEL TRUE) ######################################################################## # If we're on a development branch, we skip the patch version diff --git a/host/cmake/debian/changelog b/host/cmake/debian/changelog index c2aa25a0d..a61758fbe 100644 --- a/host/cmake/debian/changelog +++ b/host/cmake/debian/changelog @@ -1,3 +1,23 @@ +uhd (4.1.0.1-0ubuntu1) ubuntu_release; urgency=low + + * cmake + - remove redundant include + - correctly set and unset any CMAKE_REQUIRED variables + - fix finding PkgConfig to work robustly (without CMake warnings) + * core + - remove boost::math in favor of std cmath + * docs + - x4xx: Update information on CPLD updating + - usrp_x4xx: improve filesystem update instructions + * mpm + - zbx: Fix revision compat check + - Update usrp_update_fs to support X410 + - max10_cpld_flash_ctrl: improve programming log + - Skip DTS compatibility check if DTS is not being updated + + -- Ettus Research <packages@ettus.com> Mon, 12 Jul 2021 04:29:39 -0800 + + uhd (4.1.0.0-0ubuntu1) ubuntu_release; urgency=low * adf535x |