Skip to contentSkip to conversation

arm/opencsd: update to version 1.3.1

PATCH Applied Jon Mason 2 participants 3 messages Nov 2, 2022

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/2 arm/opencsd: update to version 1.3.1

---
 .../opencsd/{opencsd_1.2.0.bb => opencsd_1.3.1.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-arm/recipes-devtools/opencsd/{opencsd_1.2.0.bb => opencsd_1.3.1.bb} (95%)
meta-arm/recipes-devtools/opencsd/opencsd_1.3.1.bb renamed from meta-arm/recipes-devtools/opencsd/opencsd_1.2.0.bb +1 -1
similarity index 95%
rename from meta-arm/recipes-devtools/opencsd/opencsd_1.2.0.bb
rename to meta-arm/recipes-devtools/opencsd/opencsd_1.3.1.bb
index 0ff4b172..1c1abaa7 100644
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
 
 SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https;branch=master"
-SRCREV = "dac554d62d514b202174506995afc0e109ef3fea"
+SRCREV = "8dab50c35c8d181fc3ed6ad46e156398447d753f"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 arm/gator-daemon: update to v7.8.0

---
 ...e-xml-PmuXMLParser.h-header-from-GAT.patch | 32 -------------------
 ...-daemon_7.7.0.bb => gator-daemon_7.8.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch
 rename meta-arm/recipes-devtools/gator-daemon/{gator-daemon_7.7.0.bb => gator-daemon_7.8.0.bb} (90%)
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch deleted +0 -32
deleted file mode 100644
index 8ac2bdc4..00000000
@@ -1,32 +0,0 @@
-From 6f62c77f0a51de17b7f81f225ef483ed8214640e Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb renamed from meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +1 -2
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
@@ -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 \
           "
 
Signature · 1 line
2.17.1
Applied
#2 lore raw
In reply to Jon Mason
Quoted 1 line · Jon Mason

Applied, thanks!

[1/2] arm/opencsd: update to version 1.3.1

      commit: 59c3e948e8741c497474dfe348c46e896a4dfade
[2/2] arm/gator-daemon: update to v7.8.0
      commit: 3b7347cd67eb127a4e5757f1bd6772f83ef04a59

Best regards,

Signature · 1 line
Jon Mason <[email protected]>