From 7568b7a10c68b46809b031fcc12966f0743c7f72 Mon Sep 17 00:00:00 2001
From: Jeremy Linton <jeremy.linton@arm.com>
Date: Aug 29 2024 15:34:35 +0000
Subject: Update to upstream 1.5.4


---

diff --git a/.gitignore b/.gitignore
index b7a5571..53c7efc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /553d74524332be146675980ef611153d1a1ab6f8.tar.gz
 /c16418833b5d7cbcbcb4e2a2d917ad0147efb2be.tar.gz
 /adb97189b906d524d1c3008e67e4da34aaa0397d.tar.gz
+/7323ae88d16be4f9972b0ad60198963c64d70070.tar.gz
diff --git a/0001-hack-test.patch b/0001-hack-test.patch
index be8b526..ae285c5 100644
--- a/0001-hack-test.patch
+++ b/0001-hack-test.patch
@@ -1,4 +1,4 @@
-From 418d701244e7368a1a29f3c9006c5a65e24f5c19 Mon Sep 17 00:00:00 2001
+From 8d9408c9448d8fa243b7afead3f39ab23a03a1d9 Mon Sep 17 00:00:00 2001
 From: Jeremy Linton <jeremy.linton@arm.com>
 Date: Tue, 27 Aug 2024 20:11:01 -0500
 Subject: [PATCH] hack test
@@ -14,7 +14,7 @@ Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
  1 file changed, 3 insertions(+), 11 deletions(-)
 
 diff --git a/decoder/tests/run_pkt_decode_tests.bash b/decoder/tests/run_pkt_decode_tests.bash
-index 9b660f2..1a6480e 100755
+index 30b56f2..4cd2e52 100755
 --- a/decoder/tests/run_pkt_decode_tests.bash
 +++ b/decoder/tests/run_pkt_decode_tests.bash
 @@ -46,6 +46,8 @@
@@ -56,7 +56,7 @@ index 9b660f2..1a6480e 100755
  echo "Done : Return $?"
 -env | grep OPENCSD
  
- echo "Test with bad opcode detect on..."
+ echo "Test with bad opcode detect on using env var..."
  export OPENCSD_ERR_ON_AA64_BAD_OPCODE=1
 @@ -113,7 +106,6 @@ env | grep OPENCSD
  ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/juno_r1_1" $@ -decode -logfilename "${OUT_DIR}/juno_r1_1_badopcode.ppl"
@@ -64,8 +64,8 @@ index 9b660f2..1a6480e 100755
  echo "Done : Return $?"
 -env | grep OPENCSD
  
- 
- # === test a packet only example ===
+ echo "Test with bad opcode detect on using flag..."
+ ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/juno_r1_1" $@ -decode -aa64_opcode_chk -logfilename "${OUT_DIR}/juno_r1_1_badopcode_flag.ppl"
 -- 
 2.46.0
 
diff --git a/opencsd.spec b/opencsd.spec
index c875db9..8b4095f 100644
--- a/opencsd.spec
+++ b/opencsd.spec
@@ -1,8 +1,8 @@
-%global opencsd_tag adb97189b906d524d1c3008e67e4da34aaa0397d
+%global opencsd_tag 7323ae88d16be4f9972b0ad60198963c64d70070
 
 Name:           opencsd
-Version:        1.5.3
-Release:        1%{?dist}
+Version:        1.5.4
+Release:        0%{?dist}
 Summary:        An open source CoreSight(tm) Trace Decode library
 
 License:        BSD-3-Clause
@@ -62,6 +62,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} decoder/tests/run_pkt_decode_tests.bash -
 
 #------------------------------------------------------------------------------
 %changelog
+* Thu Aug 29 2024 Jeremy Linton <jeremy.linton@arm.com> - 1.5.4-0
+- Update to upstream 1.5.4
+
 * Tue Aug 27 2024 Jeremy Linton <jeremy.linton@arm.com> - 1.5.3-1
 - Ship the (newish) trc_pkt_lister man page, which is helpful and makes lint happy
 - Also, enable some basic decoding unit tests that ship with opencsd after we tweak them.
diff --git a/sources b/sources
index 3f4f90b..ae4c1aa 100644
--- a/sources
+++ b/sources
@@ -9,3 +9,4 @@ SHA512 (78ce8ef47c55a489b0ca575b981cd4856d03f44b.tar.gz) = aad97b74aebf1e38beeac
 SHA512 (553d74524332be146675980ef611153d1a1ab6f8.tar.gz) = a64d149cb5d3822e159effd60fbcab9892c6d3985367efcef2691617aa056204e88b18edc195a82a6d4bce5fffc23db43ace5297f543b0cd0c81f994a47f069d
 SHA512 (c16418833b5d7cbcbcb4e2a2d917ad0147efb2be.tar.gz) = 14cac190ca7196017fc40a9a57ccc5af621ce02add24d1303495c47237a2cbcf7685e0123f6f61c0316cf6f29f198b570faa29de1ca85f24f1e8fae3732b8284
 SHA512 (adb97189b906d524d1c3008e67e4da34aaa0397d.tar.gz) = 81e71ba66cf53bd47493fd0e7d43782fd0790592c4cd3bf66acec201c8ff0d06797a8c67484ee1f3ee4a3a570d16ac612d9819c154638baa34e8738ad594ee4d
+SHA512 (7323ae88d16be4f9972b0ad60198963c64d70070.tar.gz) = 4579c89330e7df156245c2708d5e6b3bd77484a1df7008090f88680d1ab96ed9ce2bbcf64849ebef1199763a4828f195922af41c6b5b0e63ee1a3e7e98a2bd0c