diff --git a/recipes-core/gnuradio/files/0001-qa-update-tests-to-work-with-OpenEmbedded.patch b/recipes-core/gnuradio/files/0001-qa-update-tests-to-work-with-OpenEmbedded.patch
deleted file mode 100644
index 9202705..0000000
--- a/recipes-core/gnuradio/files/0001-qa-update-tests-to-work-with-OpenEmbedded.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3af7aa6aebce63a39cf13f2a7acc262afe1e8a33 Mon Sep 17 00:00:00 2001
-From: Philip Balister <philip@balister.org>
-Date: Fri, 3 Dec 2021 06:33:34 -0500
-Subject: [PATCH 1/3] qa: update tests to work with OpenEmbedded
-
-* qa_nlog10.py: Update test to check for equal with one less decimal place.
-
-On the qemu machines built with OpenEmbedded, this test failed if
-the check was 5 decimal places. Relaxing to 4 lets the test pass.
-The volk routines used in the implementation pass QA already.
-
-Signed-off-by: Philip Balister <philip@balister.org>
-
-* Update QA tests to import helper routines from blocks.
-
-The file metadata QA installs a file in blocks, but imported it
-directly. Updated init.py to import via blocks. matrix interleaver
-imported some routines from a py file that was available via blocks.
-
-These cretaed issues when you install the qa tests in images to run
-them outside the build area.
-
-Signed-off-by: Philip Balister <philip@balister.org>
-
-* python formatting
-
-Signed-off-by: Josh Morman <jmorman@gnuradio.org>
-
-Co-authored-by: Josh Morman <jmorman@gnuradio.org>
----
- gr-blocks/python/blocks/qa_matrix_interleaver.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gr-blocks/python/blocks/qa_matrix_interleaver.py b/gr-blocks/python/blocks/qa_matrix_interleaver.py
-index c0a4e540e..def0d56e4 100755
---- a/gr-blocks/python/blocks/qa_matrix_interleaver.py
-+++ b/gr-blocks/python/blocks/qa_matrix_interleaver.py
-@@ -11,6 +11,7 @@
- from gnuradio import gr, gr_unittest
- from gnuradio import blocks
- 
-+
- class qa_matrix_interleaver(gr_unittest.TestCase):
- 
-     def setUp(self):
--- 
-2.31.1
-
diff --git a/recipes-core/gnuradio/files/0002-cmake-change-how-test-files-are-build-when-cross-com.patch b/recipes-core/gnuradio/files/0002-cmake-change-how-test-files-are-build-when-cross-com.patch
deleted file mode 100644
index e9485f6..0000000
--- a/recipes-core/gnuradio/files/0002-cmake-change-how-test-files-are-build-when-cross-com.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-From 116ada0f2a67ccfbbfb69ae145ac5aaad656e961 Mon Sep 17 00:00:00 2001
-From: Philip Balister <philip@balister.org>
-Date: Fri, 3 Dec 2021 06:55:42 -0500
-Subject: [PATCH 2/3] cmake: change how test files are build when cross
- compiling
-
-* When cross compiling gnuradio, change how the test files are built.
-
-Normally, the gnuradio QA code expects to run in the build tree. For the
-cross compilng case, we cannot run the QA code during the build process.
-The changes here allow the creation of an additional package that can be
-installed on a target that will run the QA code against the installed
-libraries.
-
-Major changes are not using full paths to test files (since they include
-paths that only exist on the build machine) and not setting environment
-variables in the shell files to force the QA code to use code in the
-build tree.
-
-This patch disables the C++ only tests, these need some work and then they
-can be added back for the cross compile case.
-
-Signed-off-by: Philip Balister <philip@balister.org>
----
- cmake/Modules/GrTest.cmake                     | 18 +++++++++++-------
- .../python/gnuradio/gr/CMakeLists.txt          |  3 +++
- gnuradio-runtime/python/pmt/CMakeLists.txt     |  3 +++
- gr-analog/python/analog/CMakeLists.txt         |  3 +++
- gr-audio/python/audio/CMakeLists.txt           |  3 +++
- gr-blocks/python/blocks/CMakeLists.txt         |  3 +++
- gr-channels/python/channels/CMakeLists.txt     |  3 +++
- gr-digital/python/digital/CMakeLists.txt       |  3 +++
- gr-dtv/python/dtv/CMakeLists.txt               |  3 +++
- gr-fec/python/fec/CMakeLists.txt               |  3 +++
- gr-fft/python/fft/CMakeLists.txt               |  3 +++
- gr-filter/python/filter/CMakeLists.txt         |  3 +++
- gr-qtgui/python/qtgui/CMakeLists.txt           |  5 ++++-
- gr-trellis/python/trellis/CMakeLists.txt       |  3 +++
- gr-uhd/python/uhd/CMakeLists.txt               |  3 +++
- gr-utils/modtool/tests/CMakeLists.txt          |  3 +++
- gr-video-sdl/python/video_sdl/CMakeLists.txt   |  3 +++
- gr-vocoder/python/vocoder/CMakeLists.txt       |  3 +++
- gr-wavelet/python/wavelet/CMakeLists.txt       |  3 +++
- gr-zeromq/python/zeromq/CMakeLists.txt         |  3 +++
- 20 files changed, 69 insertions(+), 8 deletions(-)
-
-diff --git a/cmake/Modules/GrTest.cmake b/cmake/Modules/GrTest.cmake
-index 7be65492e..9d75ece64 100644
---- a/cmake/Modules/GrTest.cmake
-+++ b/cmake/Modules/GrTest.cmake
-@@ -98,11 +98,13 @@ function(GR_ADD_TEST test_name)
-         endif(CMAKE_CROSSCOMPILING)
-         set(sh_file ${CMAKE_CURRENT_BINARY_DIR}/${test_name}_test.sh)
-         file(WRITE ${sh_file} "#!${SHELL}\n")
--        #each line sets an environment variable
--        foreach(environ ${environs})
--            file(APPEND ${sh_file} "export ${environ}\n")
--        endforeach(environ)
--        #load the command to run with its arguments
-+        if (NOT CMAKE_CROSSCOMPILING)
-+		#each line sets an environment variable
-+        	foreach(environ ${environs})
-+	            file(APPEND ${sh_file} "export ${environ}\n")
-+	        endforeach(environ)
-+	        #load the command to run with its arguments
-+        endif(CMAKE_CROSSCOMPILING)
-         foreach(arg ${ARGN})
-             file(APPEND ${sh_file} "${arg} ")
-         endforeach(arg)
-@@ -111,7 +113,7 @@ function(GR_ADD_TEST test_name)
-         #make the shell file executable
-         execute_process(COMMAND chmod +x ${sh_file})
- 
--        add_test(${test_name} ${SHELL} ${sh_file})
-+        add_test(${test_name} ${SHELL} ${test_name}_test.sh)
-     endif(UNIX)
- 
-     if(WIN32)
-@@ -161,5 +163,7 @@ function(GR_ADD_CPP_TEST test_name test_source)
-     set_target_properties(${test_name}
-         PROPERTIES COMPILE_DEFINITIONS "BOOST_TEST_DYN_LINK;BOOST_TEST_MAIN"
-     )
--    GR_ADD_TEST(${test_name} ${test_name})
-+    IF (NOT CMAKE_CROSSCOMPILING)
-+        GR_ADD_TEST(${test_name} ${test_name})
-+    ENDIF(CMAKE_CROSSCOMPILING)
- endfunction(GR_ADD_CPP_TEST)
-diff --git a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
-index 4633445f1..96757d1c6 100644
---- a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
-+++ b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
-@@ -34,6 +34,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gnuradio-runtime/python/pmt/CMakeLists.txt b/gnuradio-runtime/python/pmt/CMakeLists.txt
-index 3dcec8246..679104cb6 100644
---- a/gnuradio-runtime/python/pmt/CMakeLists.txt
-+++ b/gnuradio-runtime/python/pmt/CMakeLists.txt
-@@ -28,6 +28,9 @@ foreach(py_qa_test_file ${py_qa_test_files})
-         ${CMAKE_BINARY_DIR}/gnuradio-runtime/python
-     )
-     set(GR_TEST_TARGET_DEPS gnuradio-runtime)
-+    if (CMAKE_CROSSCOMPILING)
-+	get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
- endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-analog/python/analog/CMakeLists.txt b/gr-analog/python/analog/CMakeLists.txt
-index d717f305f..9e6c3a84b 100644
---- a/gr-analog/python/analog/CMakeLists.txt
-+++ b/gr-analog/python/analog/CMakeLists.txt
-@@ -41,6 +41,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-audio/python/audio/CMakeLists.txt b/gr-audio/python/audio/CMakeLists.txt
-index cc195dd06..4a5f12828 100644
---- a/gr-audio/python/audio/CMakeLists.txt
-+++ b/gr-audio/python/audio/CMakeLists.txt
-@@ -29,6 +29,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-blocks/python/blocks/CMakeLists.txt b/gr-blocks/python/blocks/CMakeLists.txt
-index b8421edcf..fe2d71340 100644
---- a/gr-blocks/python/blocks/CMakeLists.txt
-+++ b/gr-blocks/python/blocks/CMakeLists.txt
-@@ -52,6 +52,9 @@ if(ENABLE_TESTING)
- 
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- 
-diff --git a/gr-channels/python/channels/CMakeLists.txt b/gr-channels/python/channels/CMakeLists.txt
-index d05901b94..c9afd9cd2 100644
---- a/gr-channels/python/channels/CMakeLists.txt
-+++ b/gr-channels/python/channels/CMakeLists.txt
-@@ -38,6 +38,9 @@ if(ENABLE_TESTING)
-   file (GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-digital/python/digital/CMakeLists.txt b/gr-digital/python/digital/CMakeLists.txt
-index b425e4dc7..093ebc470 100644
---- a/gr-digital/python/digital/CMakeLists.txt
-+++ b/gr-digital/python/digital/CMakeLists.txt
-@@ -58,6 +58,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-dtv/python/dtv/CMakeLists.txt b/gr-dtv/python/dtv/CMakeLists.txt
-index 0bcd841b3..c35d963c1 100644
---- a/gr-dtv/python/dtv/CMakeLists.txt
-+++ b/gr-dtv/python/dtv/CMakeLists.txt
-@@ -32,6 +32,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-fec/python/fec/CMakeLists.txt b/gr-fec/python/fec/CMakeLists.txt
-index 0f051979e..caa1babdb 100644
---- a/gr-fec/python/fec/CMakeLists.txt
-+++ b/gr-fec/python/fec/CMakeLists.txt
-@@ -54,6 +54,9 @@ endif(NOT GSL_FOUND)
- 
- foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
- endforeach(py_qa_test_file)
- 
-diff --git a/gr-fft/python/fft/CMakeLists.txt b/gr-fft/python/fft/CMakeLists.txt
-index 2bd0afb0e..75c6710ff 100644
---- a/gr-fft/python/fft/CMakeLists.txt
-+++ b/gr-fft/python/fft/CMakeLists.txt
-@@ -30,6 +30,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-filter/python/filter/CMakeLists.txt b/gr-filter/python/filter/CMakeLists.txt
-index 1fb908fe6..24f88e7bb 100644
---- a/gr-filter/python/filter/CMakeLists.txt
-+++ b/gr-filter/python/filter/CMakeLists.txt
-@@ -34,6 +34,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-qtgui/python/qtgui/CMakeLists.txt b/gr-qtgui/python/qtgui/CMakeLists.txt
-index b7c4817e7..064ddada5 100644
---- a/gr-qtgui/python/qtgui/CMakeLists.txt
-+++ b/gr-qtgui/python/qtgui/CMakeLists.txt
-@@ -57,7 +57,10 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
--    GR_ADD_TEST(${py_qa_test_name} ${QA_DISPLAY_SERVER} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-+    GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
- 
-diff --git a/gr-trellis/python/trellis/CMakeLists.txt b/gr-trellis/python/trellis/CMakeLists.txt
-index b4da79663..114d6c8e2 100644
---- a/gr-trellis/python/trellis/CMakeLists.txt
-+++ b/gr-trellis/python/trellis/CMakeLists.txt
-@@ -32,6 +32,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-uhd/python/uhd/CMakeLists.txt b/gr-uhd/python/uhd/CMakeLists.txt
-index 1412e0291..0e75b5d44 100644
---- a/gr-uhd/python/uhd/CMakeLists.txt
-+++ b/gr-uhd/python/uhd/CMakeLists.txt
-@@ -32,6 +32,9 @@ include(GrTest)
- file(GLOB py_qa_test_files "qa_*.py")
- foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
- endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-utils/modtool/tests/CMakeLists.txt b/gr-utils/modtool/tests/CMakeLists.txt
-index d00d30311..049b8d514 100644
---- a/gr-utils/modtool/tests/CMakeLists.txt
-+++ b/gr-utils/modtool/tests/CMakeLists.txt
-@@ -24,6 +24,9 @@ if(ENABLE_TESTING)
- 
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- 
-diff --git a/gr-video-sdl/python/video_sdl/CMakeLists.txt b/gr-video-sdl/python/video_sdl/CMakeLists.txt
-index 20aaba85f..6c7d112ac 100644
---- a/gr-video-sdl/python/video_sdl/CMakeLists.txt
-+++ b/gr-video-sdl/python/video_sdl/CMakeLists.txt
-@@ -31,6 +31,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-vocoder/python/vocoder/CMakeLists.txt b/gr-vocoder/python/vocoder/CMakeLists.txt
-index dae780e74..04d7bd124 100644
---- a/gr-vocoder/python/vocoder/CMakeLists.txt
-+++ b/gr-vocoder/python/vocoder/CMakeLists.txt
-@@ -49,6 +49,9 @@ if(ENABLE_TESTING)
-   endif()
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-wavelet/python/wavelet/CMakeLists.txt b/gr-wavelet/python/wavelet/CMakeLists.txt
-index a1fbf173b..e1827138a 100644
---- a/gr-wavelet/python/wavelet/CMakeLists.txt
-+++ b/gr-wavelet/python/wavelet/CMakeLists.txt
-@@ -29,6 +29,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
-diff --git a/gr-zeromq/python/zeromq/CMakeLists.txt b/gr-zeromq/python/zeromq/CMakeLists.txt
-index 87ea10f83..93fed52be 100644
---- a/gr-zeromq/python/zeromq/CMakeLists.txt
-+++ b/gr-zeromq/python/zeromq/CMakeLists.txt
-@@ -39,6 +39,9 @@ if(ENABLE_TESTING)
-   file(GLOB py_qa_test_files "qa_*.py")
-   foreach(py_qa_test_file ${py_qa_test_files})
-     get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-+    if (CMAKE_CROSSCOMPILING)
-+        get_filename_component(py_qa_test_file ${py_qa_test_file} NAME)
-+    endif(CMAKE_CROSSCOMPILING)
-     GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file})
-   endforeach(py_qa_test_file)
- endif(ENABLE_TESTING)
--- 
-2.31.1
-
diff --git a/recipes-core/gnuradio/files/0003-cmake-Remove-warnings-from-GrTest.cmake.patch b/recipes-core/gnuradio/files/0003-cmake-Remove-warnings-from-GrTest.cmake.patch
deleted file mode 100644
index 62407af..0000000
--- a/recipes-core/gnuradio/files/0003-cmake-Remove-warnings-from-GrTest.cmake.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b8a6588708c26632b7b6ab192cbcb243ee5d116e Mon Sep 17 00:00:00 2001
-From: Ron Economos <w6rz@comcast.net>
-Date: Fri, 3 Dec 2021 11:49:08 -0800
-Subject: [PATCH 3/3] cmake: Remove warnings from GrTest.cmake
-
-Signed-off-by: Ron Economos <w6rz@comcast.net>
----
- cmake/Modules/GrTest.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/Modules/GrTest.cmake b/cmake/Modules/GrTest.cmake
-index 9d75ece64..ec2716293 100644
---- a/cmake/Modules/GrTest.cmake
-+++ b/cmake/Modules/GrTest.cmake
-@@ -104,7 +104,7 @@ function(GR_ADD_TEST test_name)
- 	            file(APPEND ${sh_file} "export ${environ}\n")
- 	        endforeach(environ)
- 	        #load the command to run with its arguments
--        endif(CMAKE_CROSSCOMPILING)
-+        endif(NOT CMAKE_CROSSCOMPILING)
-         foreach(arg ${ARGN})
-             file(APPEND ${sh_file} "${arg} ")
-         endforeach(arg)
-@@ -163,7 +163,7 @@ function(GR_ADD_CPP_TEST test_name test_source)
-     set_target_properties(${test_name}
-         PROPERTIES COMPILE_DEFINITIONS "BOOST_TEST_DYN_LINK;BOOST_TEST_MAIN"
-     )
--    IF (NOT CMAKE_CROSSCOMPILING)
-+    if (NOT CMAKE_CROSSCOMPILING)
-         GR_ADD_TEST(${test_name} ${test_name})
--    ENDIF(CMAKE_CROSSCOMPILING)
-+    endif(NOT CMAKE_CROSSCOMPILING)
- endfunction(GR_ADD_CPP_TEST)
--- 
-2.31.1
-
diff --git a/recipes-core/gnuradio/gnuradio_git.bb b/recipes-core/gnuradio/gnuradio_git.bb
index 9bc11de..8e74862 100644
--- a/recipes-core/gnuradio/gnuradio_git.bb
+++ b/recipes-core/gnuradio/gnuradio_git.bb
@@ -213,11 +213,11 @@ python populate_packages_prepend() {
 }
 
 #PV = "3.9.4+git${SRCPV}"
-PV = "3.9.5.0"
+PV = "v3.9.6.0"
 
 FILESPATHPKG_prepend = "gnuradio-git:"
 
-SRCREV ="cb2ab8dd1555ec08a9afbfec675b6a7c8d9dbc90"
+SRCREV ="6b953671c05530e4ff4789d66397e58af16177af"
 
 # Make it easy to test against branches
 GIT_BRANCH = "maint-3.9"