find-debuginfo: Fix skip_mini (".gnu_debugdata") handling

(cherry picked from commit 6aa93d74c485e5f76ffffd5525aa8eab93b40562)
This commit is contained in:
hugel 2025-04-21 11:56:37 +08:00 committed by openeuler-sync-bot
parent fda9005a0e
commit 9d7a84c0c7
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From 64d61a5f7d0ed685880f5c4f4b91f967445ba3a9 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 16 Jan 2025 12:02:11 +0100
Subject: [PATCH] find-debuginfo: Fix skip_mini (".gnu_debugdata") handling
The conditional that tests $skip_mini for true/false was inadvertently
flipped, causing the add_minidebug() function to no longer run for the
otherwise eligible binary files.
Fixes: 971a74d79b48 ("find-debuginfo: Check files are writable before modifying them")
Reported-by: Michal Domonkos <mdomonko@redhat.com>
Signed-off-by: Mark Wielaard <mark@klomp.org>
---
scripts/find-debuginfo.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/find-debuginfo.in b/scripts/find-debuginfo.in
index 4e4ef5a..f889e6d 100755
--- a/scripts/find-debuginfo.in
+++ b/scripts/find-debuginfo.in
@@ -550,7 +550,7 @@ do_file()
application/x-executable*) skip_mini=false ;;
application/x-pie-executable*) skip_mini=false ;;
esac
- if test "$skip_mini" = "true"; then
+ if test "$skip_mini" = "false"; then
if test "$f_writable" = "false"; then
chmod u+w "$f"
fi
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: debugedit
Version: 5.0
Release: 10
Release: 11
Summary: Tools for debuginfo creation
License: GPL-2.0-or-later and LGPL-2.1-only and GPL-3.0-only
Group: Applications
@ -25,6 +25,7 @@ Patch6001: backport-tests-Ignore-stderr-output-of-readelf-in-debugedit.a.patch
Patch6002: backport-find-debuginfo-remove-duplicate-filenames-when-creat.patch
Patch6003: backport-find-debuginfo.sh-Exit-with-real-exit-status-in-para.patch
Patch6004: backport-find-debuginfo-Check-files-are-writable-before-modif.patch
Patch6005: backport-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch
Patch9000: add-loongarch-support-for-debugedit.patch
Patch9001: add-sw_64-support.patch
@ -42,6 +43,7 @@ paths in DWARF data for debugging, tracing and profiling.
%patch6002 -p1
%patch6003 -p1
%patch6004 -p1
%patch6005 -p1
%ifarch loongarch64
%patch9000 -p1
%endif
@ -83,6 +85,9 @@ make check %{?_smp_mflags}
%{_rpmconfigdir}/debugedit
%changelog
* Mon Apr 21 2025 hugel <gengqihu2@h-partners.com> - 5.0-11
- find-debuginfo: Fix skip_mini (".gnu_debugdata") handling
* Thu Feb 27 2025 liweigang <liweiganga@uniontech.com> - 5.0-10
- add sw_64 support