[packages/rpm/dev-4.18] - patch moved to debugedit package

baggins baggins at pld-linux.org
Sat Nov 23 11:19:44 CET 2024


commit e82b402b9fe1f9879fae0e12062c23a591914be5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Nov 23 10:14:56 2024 +0100

    - patch moved to debugedit package

 rpm-builddir-readlink.patch | 24 ------------------------
 rpm.spec                    |  2 --
 2 files changed, 26 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index f478492..6b0f6e5 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -64,7 +64,6 @@ Patch4:		%{name}-scripts-closefds.patch
 Patch5:		%{name}-dir-macros-relative.patch
 Patch6:		%{name}-perl_req-INC_dirs.patch
 Patch7:		%{name}-debuginfo.patch
-Patch9:		%{name}-builddir-readlink.patch
 Patch10:	%{name}-changelog_order_check_nonfatal.patch
 Patch11:	%{name}-postun-nofail.patch
 Patch12:	%{name}-clean-docdir.patch
@@ -638,7 +637,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch5 -p1
 %patch6 -p0
 %patch7 -p1
-#%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
diff --git a/rpm-builddir-readlink.patch b/rpm-builddir-readlink.patch
deleted file mode 100644
index 069650f..0000000
--- a/rpm-builddir-readlink.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- rpm-4.5/scripts/find-debuginfo.sh~	2010-01-27 19:25:48.000000000 +0200
-+++ rpm-4.5/scripts/find-debuginfo.sh	2010-01-27 20:23:37.279516094 +0200
-@@ -385,6 +385,9 @@
-     debug_base_name="$BUILDDIR"
-     debug_dest_name="/usr/src/debug/${unique_debug_src_base}"
-   fi
-+# canon debug_base_name, the DW_AT_comp_dir in ELF objects is real a real path
-+# and debugedit will ignore them as they are out of build dir.
-+  debug_base_name=$(readlink -f "$debug_base_name")
-   no_recompute=
-   if [ "$no_recompute_build_id" = "true" ]; then
-     no_recompute="-n"
-@@ -398,6 +400,11 @@
-     $strict && exit 2
-   fi
- 
-+  if [ ! -s "$SOURCEFILE" ]; then
-+    echo >&2 "*** ${strict_error}: no sources found for $f (stripped without sourcefile information?)"
-+    $strict && exit 2
-+  fi
-+
-   # Add .gdb_index if requested.
-   if $include_gdb_index; then
-     if type gdb-add-index >/dev/null 2>&1; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/e82b402b9fe1f9879fae0e12062c23a591914be5



More information about the pld-cvs-commit mailing list