Notification time stamped 2023-04-30 08:56:02 UTC
From 68d3f0ac00025d954349826c1133f0b38a875982 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek(a)redhat.com>
Date: Apr 30 2023 08:55:51 +0000
Subject: Merge branch 'f37' into f36
---
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 368af80..6ccc4c0 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -1846,9 +1846,9 @@ function debugcheckjdk() {
IFS=$'\n'
for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
do
- # We expect to see .cpp files, except for architectures like aarch64 and
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
# s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|oS))?$"
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
done
IFS="$old_IFS"
@@ -1862,7 +1862,7 @@ function debugcheckjdk() {
# debuginfo file. There shouldn't be any debuginfo files, so the link makes
# no sense either
eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
echo "bad .gnu_debuglink section."
eu-readelf -x .gnu_debuglink "$lib"
false
https://src.fedoraproject.org/rpms/java-11-openjdk/c/68d3f0ac00025d95434982…
Notification time stamped 2023-04-30 08:56:02 UTC
From 9024e7acee066a708375ad7389b13b3211827a92 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek(a)redhat.com>
Date: Apr 29 2023 15:22:38 +0000
Subject: Synced debuginfo check with 17
---
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 368af80..6ccc4c0 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -1846,9 +1846,9 @@ function debugcheckjdk() {
IFS=$'\n'
for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
do
- # We expect to see .cpp files, except for architectures like aarch64 and
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
# s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|oS))?$"
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
done
IFS="$old_IFS"
@@ -1862,7 +1862,7 @@ function debugcheckjdk() {
# debuginfo file. There shouldn't be any debuginfo files, so the link makes
# no sense either
eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
echo "bad .gnu_debuglink section."
eu-readelf -x .gnu_debuglink "$lib"
false
https://src.fedoraproject.org/rpms/java-11-openjdk/c/9024e7acee066a708375ad…
Notification time stamped 2023-04-30 08:56:02 UTC
From f2860fb1f7517594d0d2a6149875590b18254b2b Mon Sep 17 00:00:00 2001
From: Jiri <jvanek(a)redhat.com>
Date: Apr 30 2023 08:55:35 +0000
Subject: Merge branch 'f38' into f37
---
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 368af80..6ccc4c0 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -1846,9 +1846,9 @@ function debugcheckjdk() {
IFS=$'\n'
for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
do
- # We expect to see .cpp files, except for architectures like aarch64 and
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
# s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|oS))?$"
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
done
IFS="$old_IFS"
@@ -1862,7 +1862,7 @@ function debugcheckjdk() {
# debuginfo file. There shouldn't be any debuginfo files, so the link makes
# no sense either
eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
echo "bad .gnu_debuglink section."
eu-readelf -x .gnu_debuglink "$lib"
false
https://src.fedoraproject.org/rpms/java-11-openjdk/c/f2860fb1f7517594d0d2a6…