diff mbox series

[meta-arago,master/dunfell] dma-heap-tests: Move to latest version and remove the patch.

Message ID 20220331131907.11307-1-reatmon@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master/dunfell] dma-heap-tests: Move to latest version and remove the patch. | expand

Commit Message

Ryan Eatmon March 31, 2022, 1:19 p.m. UTC 
The patch was accepted upstream so we can now move to the latest version
and remove the patch.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../dma-heap/dma-heap-tests.bb                |  6 ++--
 ...ble-name-change-to-fix-compile-error.patch | 32 -------------------
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb b/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb
index 5d35eb5e..1a230e8e 100644
--- a/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb
+++ b/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb
@@ -6,10 +6,8 @@  LIC_FILES_CHKSUM = "file://src/heap_test_fixture.cpp;beginline=1;endline=15;md5=
 PV = "1.0"
 
 BRANCH = "master"
-SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH} \
-	file://0001-Variable-name-change-to-fix-compile-error.patch \
-"
-SRCREV = "bccbfbf24baccefa09439a924f61f04e82b3910a"
+SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH}"
+SRCREV = "334fc8ec8056badc9c6667e6f1328705cb973ab4"
 
 DEPENDS = "googletest"
 
diff --git a/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch b/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch
deleted file mode 100644
index 8bc744db..00000000
--- a/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From ab0bb27b915419e3f93b4c0102837e7e748b0667 Mon Sep 17 00:00:00 2001
-From: Ryan Eatmon <reatmon@ti.com>
-Date: Thu, 13 Jan 2022 20:00:27 -0600
-Subject: [dma-heap-tests][PATCH] Variable name change to fix compile error.
-
-It appears that a recent change in the GTest CMake integration
-changed the variable names for the libraries.  This fixes that
-issue and makes the compile work under Yocto.
-
-Signed-off-by: Ryan Eatmon <reatmon@ti.com>
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71d7225..7d4a97f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,8 +19,8 @@ target_include_directories(dma-heap-unit-tests
- )
- 
- target_link_libraries(dma-heap-unit-tests
--	${GTEST_LIBRARY}
--	${GTEST_MAIN_LIBRARY}
-+    ${GTEST_LIBRARIES}
-+    ${GTEST_MAIN_LIBRARIES}
- 	pthread
- )
- 
--- 
-2.17.1
-