rpms/rpm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed an issue with the ppc64p7 support where on 32bit ppc the detection would go horribly wrong

Browse Source
This commit is contained in:
Phil Knirsch 2012-04-25 16:17:15 +02:00
parent f0f66bfa5e
commit ae517e7f5a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm-4.9.1.2-ppc64p7.patch
View File

@ -92,7 +92,7 @@ index 1b47dc3..0050091 100644
+# if defined(__linux__) && defined(__powerpc__)
+ {
+ int powerlvl;
+ if (sscanf(rpmat.platform, "power%d", &powerlvl) == 1 && powerlvl > 6)
+ if (!rstreq(un.machine, "ppc") && sscanf(rpmat.platform, "power%d", &powerlvl) == 1 && powerlvl > 6)
+ strcpy(un.machine, "ppc64p7");
+ }
+# endif /* ppc64*-linux */

5
rpm.spec
View File

@ -21,7 +21,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}3%{?dist}
Release: %{?snapver:0.%{snapver}.}4%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@ -476,6 +476,9 @@ exit 0
%doc COPYING doc/librpm/html/*
%changelog
* Wed Apr 25 2012 Phil Knirsch <pknirsch@redhat.com> 4.9.1.3-4
- Fixed an issue with the ppc64p7 support where on 32bit ppc the detection would go horribly wrong
* Wed Apr 25 2012 Phil Knirsch <pknirsch@redhat.com> 4.9.1.3-3
- Fixed missing ppc64p7 detection in installplatform