Add upstream patch to fix supermin on ppc64p7.

This commit is contained in:
Richard W.M. Jones 2014-03-28 15:46:27 +00:00
parent 3264a13cd3
commit 13dea104ae
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 0ffcc562763e8a653ac319ea96b2c09bed762de1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 28 Mar 2014 16:35:58 +0100
Subject: [PATCH] utils: ppc64p7 is an architecture variant of ppc64.
POWER 7 with VSX and other extra instructions.
---
src/utils.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/utils.ml b/src/utils.ml
index 55f6754..2e63a3a 100644
--- a/src/utils.ml
+++ b/src/utils.ml
@@ -193,7 +193,7 @@ let compare_architecture a1 a2 =
| a when string_prefix "armv7" a -> 32
| a when string_prefix "armv8" a -> 64
| "ppc" | "ppc32" -> 32
- | "ppc64" -> 64
+ | a when string_prefix "ppc64" a -> 64
| "sparc" | "sparc32" -> 32
| "sparc64" -> 64
| "ia64" -> 64
--
1.8.5.3

View File

@ -1,7 +1,7 @@
Summary: Tool for creating supermin appliances Summary: Tool for creating supermin appliances
Name: supermin Name: supermin
Version: 5.1.6 Version: 5.1.6
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
@ -11,6 +11,9 @@ ExclusiveArch: x86_64
URL: http://people.redhat.com/~rjones/supermin/ URL: http://people.redhat.com/~rjones/supermin/
Source0: http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz Source0: http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
# Upstream patch to fix supermin on ppc64p7.
Patch1: 0001-utils-ppc64p7-is-an-architecture-variant-of-ppc64.patch
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: rpm BuildRequires: rpm
BuildRequires: yum-utils BuildRequires: yum-utils
@ -51,6 +54,8 @@ second when you need to boot one of them.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
%configure --disable-network-tests %configure --disable-network-tests
@ -84,6 +89,9 @@ make check || {
%changelog %changelog
* Fri Mar 28 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.6-4
- Add upstream patch to fix supermin on ppc64p7.
* Thu Mar 27 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.6-3 * Thu Mar 27 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.6-3
- New upstream version 5.1.6. - New upstream version 5.1.6.
- Fix tests. - Fix tests.