From 9b56e7910bcd4d6c6186ea7ea4c56399606964550288ca0d272307af64c6b472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Wed, 6 Jul 2022 13:31:34 +0000 Subject: [PATCH] Accepting request 987205 from home:lnussel:build - move find-debuginfo and sepdebugcrcfix which are basically tools for use by rpmbuild only to /usr/lib/rpm where they used to be when debugedit was bundled with rpm. OBS-URL: https://build.opensuse.org/request/show/987205 OBS-URL: https://build.opensuse.org/package/show/Base:System/debugedit?expand=0&rev=4 --- debugedit.changes | 7 +++++++ debugedit.spec | 8 ++++++-- debuginfo-mono.patch | 8 +++----- debuglink.patch | 8 +++----- debugsubpkg.patch | 8 +++----- finddebuginfo.patch | 14 ++++++-------- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/debugedit.changes b/debugedit.changes index b269482..ad627fd 100644 --- a/debugedit.changes +++ b/debugedit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 6 12:43:49 UTC 2022 - Ludwig Nussel + +- move find-debuginfo and sepdebugcrcfix which are basically tools + for use by rpmbuild only to /usr/lib/rpm where they used to be + when debugedit was bundled with rpm. + ------------------------------------------------------------------- Mon Jun 27 11:36:59 UTC 2022 - Ludwig Nussel diff --git a/debugedit.spec b/debugedit.spec index b2d6b87..b4bce18 100644 --- a/debugedit.spec +++ b/debugedit.spec @@ -63,13 +63,17 @@ autoreconf -fiv %install %make_install +mkdir -p %{buildroot}/usr/lib/rpm +mv %{buildroot}%{_bindir}/{find-debuginfo,sepdebugcrcfix} %{buildroot}/usr/lib/rpm +ln -s ../../bin/debugedit %{buildroot}/usr/lib/rpm %files %license COPYING3 %doc README %{_bindir}/debugedit -%{_bindir}/find-debuginfo -%{_bindir}/sepdebugcrcfix +/usr/lib/rpm/debugedit +/usr/lib/rpm/find-debuginfo +/usr/lib/rpm/sepdebugcrcfix %{_mandir}/man1/debugedit.1%{?ext_man} %{_mandir}/man1/find-debuginfo.1%{?ext_man} %{_mandir}/man1/sepdebugcrcfix.1%{?ext_man} diff --git a/debuginfo-mono.patch b/debuginfo-mono.patch index 7952fca..0535dc1 100644 --- a/debuginfo-mono.patch +++ b/debuginfo-mono.patch @@ -1,8 +1,6 @@ -Index: scripts/find-debuginfo.in -=================================================================== ---- scripts/find-debuginfo.in.orig -+++ scripts/find-debuginfo.in -@@ -434,6 +434,16 @@ while read nlinks inum f; do +--- ./scripts/find-debuginfo.in.orig 2017-12-01 15:40:27.006764372 +0000 ++++ ./scripts/find-debuginfo.in 2017-12-01 15:41:17.270619182 +0000 +@@ -348,6 +348,16 @@ while read nlinks inum f; do ;; *) continue ;; esac diff --git a/debuglink.patch b/debuglink.patch index bfd58dd..cdbcf56 100644 --- a/debuglink.patch +++ b/debuglink.patch @@ -1,8 +1,6 @@ -Index: scripts/find-debuginfo.in -=================================================================== ---- scripts/find-debuginfo.in.orig -+++ scripts/find-debuginfo.in -@@ -407,7 +407,7 @@ debug_link() +--- ./scripts/find-debuginfo.in.orig 2017-12-01 15:39:07.239994681 +0000 ++++ ./scripts/find-debuginfo.in 2017-12-01 15:39:34.942914702 +0000 +@@ -321,7 +321,7 @@ debug_link() get_debugfn() { dn=$(dirname "${1#$RPM_BUILD_ROOT}") diff --git a/debugsubpkg.patch b/debugsubpkg.patch index aac940d..50f8cac 100644 --- a/debugsubpkg.patch +++ b/debugsubpkg.patch @@ -1,8 +1,6 @@ -Index: scripts/find-debuginfo.in -=================================================================== ---- scripts/find-debuginfo.in.orig -+++ scripts/find-debuginfo.in -@@ -643,19 +643,25 @@ if $run_dwz \ +--- ./scripts/find-debuginfo.in.orig 2017-12-01 15:35:59.023537837 +0000 ++++ ./scripts/find-debuginfo.in 2017-12-01 15:36:30.351447397 +0000 +@@ -548,19 +548,25 @@ if $run_dwz \ fi fi diff --git a/finddebuginfo.patch b/finddebuginfo.patch index 1002025..12ec95e 100644 --- a/finddebuginfo.patch +++ b/finddebuginfo.patch @@ -1,8 +1,6 @@ -Index: scripts/find-debuginfo.in -=================================================================== ---- scripts/find-debuginfo.in.orig -+++ scripts/find-debuginfo.in -@@ -412,12 +412,18 @@ trap 'rm -rf "$temp"' EXIT +--- ./scripts/find-debuginfo.in.orig 2019-09-09 07:56:53.377788842 +0000 ++++ ./scripts/find-debuginfo.in 2019-10-02 11:11:56.878979662 +0000 +@@ -348,12 +348,18 @@ trap 'rm -rf "$temp"' EXIT # Build a list of unstripped ELF files and their hardlinks touch "$temp/primary" @@ -26,7 +24,7 @@ Index: scripts/find-debuginfo.in if [ $nlinks -gt 1 ]; then var=seen_$inum if test -n "${!var}"; then -@@ -450,6 +456,8 @@ do_file() +@@ -386,6 +392,8 @@ do_file() if [ "$no_recompute_build_id" = "true" ]; then no_recompute="-n" fi @@ -35,7 +33,7 @@ Index: scripts/find-debuginfo.in id=$(${install_dir}/debugedit -b "$debug_base_name" -d "$debug_dest_name" \ $no_recompute -i \ ${build_id_seed:+--build-id-seed="$build_id_seed"} \ -@@ -477,17 +485,30 @@ do_file() +@@ -413,17 +421,30 @@ do_file() # just has its file names collected and adjusted. case "$dn" in /usr/lib/debug/*) @@ -73,7 +71,7 @@ Index: scripts/find-debuginfo.in # strip -g implies we have full symtab, don't add mini symtab in that case. # It only makes sense to add a minisymtab for executables and shared -@@ -646,12 +667,14 @@ if [ -s "$SOURCEFILE" ]; then +@@ -581,12 +602,14 @@ if [ -s "$SOURCEFILE" ]; then # and non-standard modes may be inherented from original directories, fixup find "${RPM_BUILD_ROOT}${debug_dest_name}" -type d -print0 | xargs --no-run-if-empty -0 chmod 0755