aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG16
-rw-r--r--host/cmake/Modules/UHDVersion.cmake8
-rw-r--r--host/cmake/debian/changelog20
-rw-r--r--images/manifest.txt28
4 files changed, 55 insertions, 17 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7d790b518..b1998bb4a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,22 @@
Change Log for Releases
==============================
+## 004.001.000.001
+* 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
+
## 004.001.000.000
* adf535x
- Change freq_resolution to mod2
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
diff --git a/images/manifest.txt b/images/manifest.txt
index 2c19207ae..968381c5f 100644
--- a/images/manifest.txt
+++ b/images/manifest.txt
@@ -6,9 +6,9 @@ x4xx_x410_fpga_default uhd-d5c2750 x4xx/uhd-d5c2750/x4xx_x410_fpg
x4xx_x410_cpld_default uhd-d5c2750 x4xx/uhd-d5c2750/x4xx_x410_cpld_default-gd5c2750.zip a5be55bd47761ae7cd3edd2d75130dea685f8278a0695ff688fa68ee85491679
x4xx_zbx_cpld_default uhd-d5c2750 x4xx/uhd-d5c2750/x4xx_zbx_cpld_default-gd5c2750.zip f4e2fce5a57052b0efd9b4b247dd816d842de63b03091bd4f030dc01fd5a3fd0
# X410-Series Filesystems
-x4xx_common_sdk_default meta-ettus-v4.1.0.0 x4xx/meta-ettus-v4.1.0.0/x4xx_common_sdk_default-v4.1.0.0.zip 0
-x4xx_common_mender_default meta-ettus-v4.1.0.0 x4xx/meta-ettus-v4.1.0.0/x4xx_common_mender_default-v4.1.0.0.zip 0
-x4xx_common_sdimg_default meta-ettus-v4.1.0.0 x4xx/meta-ettus-v4.1.0.0/x4xx_common_sdimg_default-v4.1.0.0.zip 0
+x4xx_common_sdk_default meta-ettus-v4.1.0.1 x4xx/meta-ettus-v4.1.0.1/x4xx_common_sdk_default-v4.1.0.1.zip 0
+x4xx_common_mender_default meta-ettus-v4.1.0.1 x4xx/meta-ettus-v4.1.0.1/x4xx_common_mender_default-v4.1.0.1.zip 0
+x4xx_common_sdimg_default meta-ettus-v4.1.0.1 x4xx/meta-ettus-v4.1.0.1/x4xx_common_sdimg_default-v4.1.0.1.zip 0
# X300-Series
x3xx_x310_fpga_default uhd-d5c2750 x3xx/uhd-d5c2750/x3xx_x310_fpga_default-gd5c2750.zip 092e5960059bd8400c901ad8ac0852707c67b758979c80d99ed246260bb4390b
@@ -23,16 +23,16 @@ e3xx_e310_sg3_fpga_default uhd-d5c2750 e3xx/uhd-d5c2750/e3xx_e310_sg3
e3xx_e320_fpga_default uhd-d5c2750 e3xx/uhd-d5c2750/e3xx_e320_fpga_default-gd5c2750.zip c88c35b95986f5da29ca9ef70f46c8c2dc0c8ee2ae6f929b06b9c5979397cb6a
# E310 Filesystems
-e3xx_e310_sdk_default meta-ettus-v4.1.0.0 e3xx/meta-ettus-v4.1.0.0/e3xx_e310_sdk_default-v4.1.0.0.zip 0
-e3xx_e310_sg1_mender_default meta-ettus-v4.1.0.0 e3xx/meta-ettus-v4.1.0.0/e3xx_e310_sg1_mender_default-v4.1.0.0.zip 0
-e3xx_e310_sg1_sdimg_default meta-ettus-v4.1.0.0 e3xx/meta-ettus-v4.1.0.0/e3xx_e310_sg1_sdimg_default-v4.1.0.0.zip 0
-e3xx_e310_sg3_mender_default meta-ettus-v4.1.0.0 e3xx/meta-ettus-v4.1.0.0/e3xx_e310_sg3_mender_default-v4.1.0.0.zip 0
-e3xx_e310_sg3_sdimg_default meta-ettus-v4.1.0.0 e3xx/meta-ettus-v4.1.0.0/e3xx_e310_sg3_sdimg_default-v4.1.0.0.zip 0
+e3xx_e310_sdk_default meta-ettus-v4.1.0.1 e3xx/meta-ettus-v4.1.0.1/e3xx_e310_sdk_default-v4.1.0.1.zip 0
+e3xx_e310_sg1_mender_default meta-ettus-v4.1.0.1 e3xx/meta-ettus-v4.1.0.1/e3xx_e310_sg1_mender_default-v4.1.0.1.zip 0
+e3xx_e310_sg1_sdimg_default meta-ettus-v4.1.0.1 e3xx/meta-ettus-v4.1.0.1/e3xx_e310_sg1_sdimg_default-v4.1.0.1.zip 0
+e3xx_e310_sg3_mender_default meta-ettus-v4.1.0.1 e3xx/meta-ettus-v4.1.0.1/e3xx_e310_sg3_mender_default-v4.1.0.1.zip 0
+e3xx_e310_sg3_sdimg_default meta-ettus-v4.1.0.1 e3xx/meta-ettus-v4.1.0.1/e3xx_e310_sg3_sdimg_default-v4.1.0.1.zip 0
# E320 Filesystems, etc
-e3xx_e320_sdk_default meta-ettus-v4.1.0.0 e3xx/meta-ettus-v4.1.0.0/e3xx_e320_sdk_default-v4.1.0.0.zip 0
-e3xx_e320_mender_default meta-ettus-v4.1.0.0 e3xx/meta-ettus-v4.1.0.0/e3xx_e320_mender_default-v4.1.0.0.zip 0
-e3xx_e320_sdimg_default meta-ettus-v4.1.0.0 e3xx/meta-ettus-v4.1.0.0/e3xx_e320_sdimg_default-v4.1.0.0.zip 0
+e3xx_e320_sdk_default meta-ettus-v4.1.0.1 e3xx/meta-ettus-v4.1.0.1/e3xx_e320_sdk_default-v4.1.0.1.zip 0
+e3xx_e320_mender_default meta-ettus-v4.1.0.1 e3xx/meta-ettus-v4.1.0.1/e3xx_e320_mender_default-v4.1.0.1.zip 0
+e3xx_e320_sdimg_default meta-ettus-v4.1.0.1 e3xx/meta-ettus-v4.1.0.1/e3xx_e320_sdimg_default-v4.1.0.1.zip 0
# N300-Series
n3xx_n310_fpga_default uhd-d5c2750 n3xx/uhd-d5c2750/n3xx_n310_fpga_default-gd5c2750.zip 9555ffada2cd4fc643fac87b81a195ab2287654f74cba4f9424b55e148adcc84
@@ -43,9 +43,9 @@ n3xx_n320_cpld_default fpga-4bc2c6f n3xx/fpga-4bc2c6f/n3xx_n320_c
# N3XX Mykonos firmware
#n3xx_n310_fw_default fpga-6bea23d n3xx/fpga-6bea23d/n3xx_n310_fw_default-g6bea23d.zip 0
# N300-Series Filesystems, etc
-n3xx_common_sdk_default meta-ettus-v4.1.0.0 n3xx/meta-ettus-v4.1.0.0/n3xx_common_sdk_default-v4.1.0.0.zip 0
-n3xx_common_mender_default meta-ettus-v4.1.0.0 n3xx/meta-ettus-v4.1.0.0/n3xx_common_mender_default-v4.1.0.0.zip 0
-n3xx_common_sdimg_default meta-ettus-v4.1.0.0 n3xx/meta-ettus-v4.1.0.0/n3xx_common_sdimg_default-v4.1.0.0.zip 0
+n3xx_common_sdk_default meta-ettus-v4.1.0.1 n3xx/meta-ettus-v4.1.0.1/n3xx_common_sdk_default-v4.1.0.1.zip 0
+n3xx_common_mender_default meta-ettus-v4.1.0.1 n3xx/meta-ettus-v4.1.0.1/n3xx_common_mender_default-v4.1.0.1.zip 0
+n3xx_common_sdimg_default meta-ettus-v4.1.0.1 n3xx/meta-ettus-v4.1.0.1/n3xx_common_sdimg_default-v4.1.0.1.zip 0
# B200-Series
b2xx_b200_fpga_default uhd-d5c2750 b2xx/uhd-d5c2750/b2xx_b200_fpga_default-gd5c2750.zip 9936f356c51a86a98ecb81851ed217b1aaadea52e5a5efa0a1bca90edfec30cf
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 05:17:45 +0000