rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fix wrong use of variable strip_g in find-debuginfo.sh

Browse Source 
- resolves: #1207434
This commit is contained in:
Lubos Kardos 2015-03-31 10:51:01 +02:00
parent e972e4365d
commit dabd097bc0
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm-4.10.0-minidebuginfo.patch
View File

@ -91,7 +91,7 @@
fi fi
+ # strip -g implies we have full symtab, don't add mini symtab in that case. + # strip -g implies we have full symtab, don't add mini symtab in that case.
+ strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f") + $strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f")
+ +
if [ -n "$id" ]; then if [ -n "$id" ]; then
make_id_link "$id" "$dn/$(basename $f)" make_id_link "$id" "$dn/$(basename $f)"

2
rpm-4.11.1-sepdebugcrcfix.patch
View File

@ -29,7 +29,7 @@
@@ -316,6 +318,8 @@ @@ -316,6 +318,8 @@
# strip -g implies we have full symtab, don't add mini symtab in that case. # strip -g implies we have full symtab, don't add mini symtab in that case.
strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f") $strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f")
+ +
+ echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE" + echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE"

5
rpm.spec
View File

@ -27,7 +27,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}12%{?dist} Release: %{?snapver:0.%{snapver}.}13%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2 Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
@ -547,6 +547,9 @@ exit 0
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Tue Mar 31 2015 Lubos Kardos <lkardos@redhat.com> 4.12.0-13
- Fix wrong use of variable strip_g in find-debuginfo.sh (#1207434)
* Mon Mar 30 2015 Lubos Kardos <lkardos@redhat.com> 4.12.0-12 * Mon Mar 30 2015 Lubos Kardos <lkardos@redhat.com> 4.12.0-12
- Fix segmentation fault (#1206750) - Fix segmentation fault (#1206750)