Remove patch which is included in 5.2.1.

Enable GPG signature verification.
This commit is contained in:
Richard W.M. Jones 2021-02-01 09:48:54 +00:00
parent 987c3207fc
commit d4841876ba
2 changed files with 1 additions and 34 deletions

View File

@ -1,29 +0,0 @@
From 3f831d30d87658d362e9b4f25fa569937fa1c23f Mon Sep 17 00:00:00 2001
From: Gustavo Luiz Duarte <gustavold@linux.ibm.com>
Date: Tue, 31 Mar 2020 23:11:44 -0300
Subject: [PATCH] supermin: Fix IBM Virtual SCSI driver name
The driver was renamed from ibmvscsic to ibmvscsi on kernel 3.7.
See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9965c2f19be470c452357ae4f6304467cdeada55
The old name is kept so supermin works with recent kernels as well as kernel
version older than 3.7.
---
src/format_ext2_initrd.ml | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/format_ext2_initrd.ml b/src/format_ext2_initrd.ml
index b67bb55..38977e6 100644
--- a/src/format_ext2_initrd.ml
+++ b/src/format_ext2_initrd.ml
@@ -44,6 +44,7 @@ let kmods = [
"crc*.ko*";
"libcrc*.ko*";
"ibmvscsic.ko*";
+ "ibmvscsi.ko*";
"libnvdimm.ko*";
"nd_pmem.ko*";
"nd_btt.ko*";
--
2.24.1

View File

@ -21,7 +21,7 @@
%endif %endif
# Whether we should verify tarball signature with GPGv2. # Whether we should verify tarball signature with GPGv2.
%global verify_tarball_signature %{nil} %global verify_tarball_signature 1
# The source directory. # The source directory.
%global source_directory 5.2-stable %global source_directory 5.2-stable
@ -40,10 +40,6 @@ Source1: http://download.libguestfs.org/supermin/%{source_directory}/%{nam
# Keyring used to verify tarball signature. # Keyring used to verify tarball signature.
Source2: libguestfs.keyring Source2: libguestfs.keyring
# Fix: ppc64le: ibmvscsi driver missing from supermin appliance.
# Upstream patch, fixes RHBZ#1819019
Patch1: 0001-supermin-Fix-IBM-Virtual-SCSI-driver-name.patch
BuildRequires: make BuildRequires: make
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2html BuildRequires: /usr/bin/pod2html