[supermin/f21] Don't ignore lpae kernels (upstream patch for RHBZ#1199733).

Richard W.M. Jones rjones at fedoraproject.org
Mon Mar 9 09:08:27 UTC 2015


commit 4e1d9ccab1f506c4e86ef3b49419a5c4c7c62725
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Mar 9 09:08:04 2015 +0000

    Don't ignore lpae kernels (upstream patch for RHBZ#1199733).

 0001-arm-Don-t-ignore-lpae-kernels.patch | 25 +++++++++++++++++++++++++
 supermin.spec                            |  9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/0001-arm-Don-t-ignore-lpae-kernels.patch b/0001-arm-Don-t-ignore-lpae-kernels.patch
new file mode 100644
index 0000000..6780e89
--- /dev/null
+++ b/0001-arm-Don-t-ignore-lpae-kernels.patch
@@ -0,0 +1,25 @@
+From 68332640d5d78317e7914995a2c6883574c864e5 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Thu, 5 Mar 2015 10:10:18 +0000
+Subject: [PATCH] arm: Don't ignore lpae kernels.
+
+---
+ src/kernel.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kernel.ml b/src/kernel.ml
+index 9a0af91..046cde9 100644
+--- a/src/kernel.ml
++++ b/src/kernel.ml
+@@ -122,7 +122,7 @@ and kernel_filter patterns is_arm all_files =
+     if not is_arm then files
+     else (
+       List.filter (fun filename ->
+-        find filename "lpae" = -1 && find filename "tegra" = -1
++	find filename "tegra" = -1
+       ) files
+     ) in
+   List.filter (fun filename -> has_modpath filename) files
+-- 
+2.3.1
+
diff --git a/supermin.spec b/supermin.spec
index 1dfab4e..a1ba6fd 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -1,7 +1,7 @@
 Summary:       Tool for creating supermin appliances
 Name:          supermin
 Version:       5.1.10
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       GPLv2+
 
 %if 0%{?rhel} >= 7
@@ -14,6 +14,9 @@ Source0:       http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
 # Upstream patch for RHBZ#1155586
 Patch1:        0001-supermin-Remove-trailing-slash-from-readlink-filenam.patch
 
+# Don't ignore lpae kernels (upstream patch for RHBZ#1199733).
+Patch2:        0001-arm-Don-t-ignore-lpae-kernels.patch
+
 BuildRequires: /usr/bin/pod2man
 BuildRequires: rpm
 BuildRequires: yum-utils
@@ -56,6 +59,7 @@ second when you need to boot one of them.
 %setup -q
 
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -89,6 +93,9 @@ make check || {
 
 
 %changelog
+* Mon Mar  9 2015 Richard W.M. Jones <rjones at redhat.com> - 5.1.10-3
+- Don't ignore lpae kernels (upstream patch for RHBZ#1199733).
+
 * Wed Nov 26 2014 Richard W.M. Jones <rjones at redhat.com> - 5.1.10-2
 - Upstream patch for RHBZ#1155586.
 


More information about the scm-commits mailing list