Resurrect debuginfo GDB index generation (#1410907)

This commit is contained in:
Panu Matilainen 2017-01-23 15:45:57 +02:00
parent 8fcb9658d2
commit 4324465d43
2 changed files with 27 additions and 0 deletions

25
rpm-4.13.0-gdbindex.patch Normal file
View File

@ -0,0 +1,25 @@
commit de7a1e279f8a21fe3494daeb27801db74e8420c5
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Tue Jan 17 12:21:48 2017 +0200
Resurrect GDB index generation (RhBug:1410907)
Commit 54d30ac4a344770571e56c60281a9130b61c1788 broke GDB index
generation due to a leftover "[". In git master this got fixed in
commit 67d3df338875ad5d9601e360bfdbd4289f271bc1 but we don't want
that on 4.13.x because there are behavior changes involved, so
fixing this specifically on the 4.13.x branch.
diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index a70ef3c..4293261 100644
--- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh
@@ -312,7 +312,7 @@ while read nlinks inum f; do
$strict && exit 2
fi
- [ type gdb-add-index >/dev/null 2>&1 && gdb-add-index "$f" > /dev/null 2>&1
+ type gdb-add-index >/dev/null 2>&1 && gdb-add-index "$f" > /dev/null 2>&1
# A binary already copied into /usr/lib/debug doesn't get stripped,
# just has its file names collected and adjusted.

View File

@ -54,6 +54,7 @@ Patch5: rpm-4.12.0-rpm2cpio-hack.patch
# Patches already upstream: # Patches already upstream:
Patch100: rpm-4.13.x-transfiletriggerpostun-invalid-read.patch Patch100: rpm-4.13.x-transfiletriggerpostun-invalid-read.patch
Patch101: rpm-4.13.0-signaturesize.patch Patch101: rpm-4.13.0-signaturesize.patch
Patch102: rpm-4.13.0-gdbindex.patch
Patch133: rpm-4.13.x-pythondistdeps.patch Patch133: rpm-4.13.x-pythondistdeps.patch
Patch134: rpm-4.13.x-pythondistdeps-Makefile.patch Patch134: rpm-4.13.x-pythondistdeps-Makefile.patch
@ -568,6 +569,7 @@ exit 0
%changelog %changelog
* Mon Jan 23 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0-11 * Mon Jan 23 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0-11
- Fix malformed packages being generated around 4GB boundary (#1405570) - Fix malformed packages being generated around 4GB boundary (#1405570)
- Resurrect debuginfo GDB index generation (#1410907)
* Fri Jan 06 2017 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 4.13.0-10 * Fri Jan 06 2017 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 4.13.0-10
- Add Requires: python-setuptools for rpm-build (RHBZ #1410631) - Add Requires: python-setuptools for rpm-build (RHBZ #1410631)