From 16840189f72236af8760532eba3ea95316043fa1 Mon Sep 17 00:00:00 2001 From: Sergey Kolosov Date: Fri, 27 Feb 2026 11:43:01 +0100 Subject: [PATCH 1/3] CI Tests: run bz1661513 test last Ensure that the test runs last because it removes packages. Add order:1000 to main.fmf. Test name: Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries RPM-Changelog: - RPM-Skip-Release: yes --- .../main.fmf | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/main.fmf b/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/main.fmf index 31302be..39acd0b 100644 --- a/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/main.fmf +++ b/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/main.fmf @@ -14,5 +14,6 @@ recommend: - glibc - gdb duration: 15m +order: 1000 extra-summary: /tools/glibc/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries extra-task: /tools/glibc/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries From 17eca93ea4bd2947ce13a30dae9b4fc3ca302c28 Mon Sep 17 00:00:00 2001 From: Sergey Kolosov Date: Fri, 27 Feb 2026 12:02:08 +0100 Subject: [PATCH 2/3] CI Tests: fix dynamic loader detection for bz1661513 test Fix dynamic loader file name detection by using readlink. This issue was observed on s390x and ppc64le architectures. Test name: Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries RPM-Changelog: - RPM-Skip-Release: yes --- .../runtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/runtest.sh b/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/runtest.sh index e40714d..31bdebe 100755 --- a/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/runtest.sh +++ b/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/runtest.sh @@ -48,7 +48,7 @@ rlJournalStart rlAssertGrep "ldconfig.*, stripped" output.log rlAssertGrep "iconvconfig.*, stripped" output.log rlAssertGrep "localedef.*, stripped" output.log - rlAssertGrep "ld-.*, not stripped" output.log + rlAssertGrep "$(readlink -f /usr/bin/ld.so).*, not stripped" output.log rlLogInfo "Content of output.log:\n$(cat output.log)" # some debugging info (e.g. pthread struct) should be accessible even without installed debuginfo packages From da102a69e4cf32920e1b52b5289d73450a5ed3bf Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 16 Feb 2026 16:16:58 -0500 Subject: [PATCH 3/3] Remove unneeded ld-linux .debug files Resolves: RHEL-136312 --- wrap-find-debuginfo.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wrap-find-debuginfo.sh b/wrap-find-debuginfo.sh index 5257de7..7bc79aa 100644 --- a/wrap-find-debuginfo.sh +++ b/wrap-find-debuginfo.sh @@ -114,6 +114,13 @@ for ldso_debug_candidate in `find "$sysroot_path" -maxdepth 2 \ fi done rm -f "$ldso_debug" +# Same logic, but for installed ld-linux*.debug files, where the depth +# is more and there may be more than one (32-bit and 64-bit) +for ldso_debug_candidate in `find "$sysroot_path/usr/lib/debug" \ + -regextype posix-extended \ + -regex '.*/ld(-.*|64|)\.so\.[0-9]+.*debug$' -type f` ; do + rm -f "$ldso_debug_candidate" +done # ld.so: Rewrite the source file paths to match the extracted # locations. First compute the arguments for invoking debugedit.