04a710dd91
Reorder patches, so that the upstream changeset comes last Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tony Hutter <hutter2@llnl.gov>
|
|
Date: Wed, 7 Nov 2018 15:48:24 -0800
|
|
Subject: [PATCH] Add BuildRequires gcc, make, elfutils-libelf-devel
|
|
|
|
This adds a BuildRequires for gcc, make, and elfutils-libelf-devel
|
|
into our spec files. gcc has been a packaging requirement for
|
|
awhile now:
|
|
|
|
https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B
|
|
|
|
These additional BuildRequires allow us to mock build in
|
|
Fedora 29.
|
|
|
|
Reviewed-by: Neal Gompa <ngompa@datto.com>
|
|
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
|
|
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
|
|
Closes #8095
|
|
Closes #8102
|
|
---
|
|
rpm/generic/zfs-kmod.spec.in | 4 ++++
|
|
rpm/generic/zfs.spec.in | 1 +
|
|
2 files changed, 5 insertions(+)
|
|
|
|
diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in
|
|
index d4746f5b..ecf14ece 100644
|
|
--- a/rpm/generic/zfs-kmod.spec.in
|
|
+++ b/rpm/generic/zfs-kmod.spec.in
|
|
@@ -52,6 +52,10 @@ URL: http://zfsonlinux.org/
|
|
Source0: %{module}-%{version}.tar.gz
|
|
Source10: kmodtool
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
|
|
+%if 0%{?rhel}%{?fedora}
|
|
+BuildRequires: gcc, make
|
|
+BuildRequires: elfutils-libelf-devel
|
|
+%endif
|
|
|
|
# The developments headers will conflict with the dkms packages.
|
|
Conflicts: %{module}-dkms
|
|
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
|
|
index fa6f1571..c1b8f2c8 100644
|
|
--- a/rpm/generic/zfs.spec.in
|
|
+++ b/rpm/generic/zfs.spec.in
|
|
@@ -91,6 +91,7 @@ Provides: %{name}-kmod-common = %{version}
|
|
Conflicts: zfs-fuse
|
|
|
|
%if 0%{?rhel}%{?fedora}%{?suse_version}
|
|
+BuildRequires: gcc, make
|
|
BuildRequires: zlib-devel
|
|
BuildRequires: libuuid-devel
|
|
BuildRequires: libblkid-devel
|