diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch deleted file mode 100644 index 8ac2bdc4..00000000 --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6f62c77f0a51de17b7f81f225ef483ed8214640e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 26 Jun 2021 14:19:10 -0700 -Subject: [PATCH] Sources.mk: Remove xml/PmuXMLParser.h header from - GATORD_CXX_SRC_FILES - -This otherwise appears in final linker cmdline and clang is not happy -since it sees this as an output file along with the real output file -specified with -o and bails out - -| clang-13: error: cannot specify -o when generating multiple output files - -Upstream-Status: Backport [https://github.com/ARM-software/gator/commit/6ef311882a56e14c189d70c4d72945dd95e9b88e] -Signed-off-by: Khem Raj ---- - daemon/Sources.mk | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/daemon/Sources.mk b/daemon/Sources.mk -index 60d15ef..3e679f5 100644 ---- a/daemon/Sources.mk -+++ b/daemon/Sources.mk -@@ -147,5 +147,4 @@ GATORD_CXX_SRC_FILES := \ - xml/EventsXMLProcessor.cpp \ - xml/MxmlUtils.cpp \ - xml/PmuXML.cpp \ -- xml/PmuXMLParser.cpp \ -- xml/PmuXMLParser.h -+ xml/PmuXMLParser.cpp --- -2.32.0 - diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb similarity index 90% rename from meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb rename to meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb index 07b8abbf..0daebfde 100644 --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +++ b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb @@ -15,9 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://k/perf_event.h;endline=14;md5=e548bf30a60b2ed11ef2dcf7bfdac230 \ " -SRCREV = "9d8d75fa08352470c51abc23fe3b314879bd8b78" +SRCREV = "6a944e7ee1f1c3ab9b2a57efd24c58503122db02" SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https \ - file://0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch;striplevel=2 \ file://0001-daemon-mxml-Define-_GNU_SOURCE.patch;striplevel=2 \ "