From 0df23ca9a18bcc3b76319a3c0b93359a5468d016 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 25 Mar 2013 11:28:18 -0700 Subject: [PATCH] Provide ${kmodname}-devel-kmod for yum-builddep In order to ensure that yum-builddep pulls in all the build requirements a generic ${kmodname}-devel-kmod provides line is added. This allows a version of the development headers to be included without requiring knowledge of the kernel version. This is important because unlike rpmbuild which does correctly expand the source rpm spec file, yum-builddep does not. Without this generic provides line mock which relies on yum-builddep is unable to automatically satisfy the dependency. Signed-off-by: Brian Behlendorf --- rpm/fedora/zfs-kmod.spec.in | 3 ++- rpm/generic/zfs-kmod.spec.in | 3 ++- scripts/kmodtool | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rpm/fedora/zfs-kmod.spec.in b/rpm/fedora/zfs-kmod.spec.in index ac5f42a24..323b99f4a 100644 --- a/rpm/fedora/zfs-kmod.spec.in +++ b/rpm/fedora/zfs-kmod.spec.in @@ -30,8 +30,9 @@ ExcludeArch: ppc ppc64 Conflicts: %{module}-dkms BuildRequires: %{_bindir}/kmodtool +BuildRequires: spl-devel-kmod = %{version}-%{release} -%global KmodsBuildRequires kmod-spl-devel +%global KmodsBuildRequires spl-devel-kmod %global KmodsRequires kmod-spl %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in index 8b2dcd152..d99446b21 100644 --- a/rpm/generic/zfs-kmod.spec.in +++ b/rpm/generic/zfs-kmod.spec.in @@ -26,7 +26,8 @@ Conflicts: %{module}-dkms %{?suse_version:BuildRequires: kernel-source} %if 0%{?rhel}%{?fedora}%{?suse_version} -%global KmodsBuildRequires kmod-spl-devel +BuildRequires: spl-devel-kmod = %{version}-%{release} +%global KmodsBuildRequires spl-devel-kmod %global KmodsRequires kmod-spl %endif diff --git a/scripts/kmodtool b/scripts/kmodtool index 2170c4a90..2fe014c7f 100755 --- a/scripts/kmodtool +++ b/scripts/kmodtool @@ -243,7 +243,8 @@ print_rpmtemplate_per_kmoddevelpkg () Summary: ${kmodname} kernel module(s) devel for ${kernel_uname_r} Group: System Environment/Kernel Requires: ${kmodname}-devel-kmod-common = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: kmod-${kmodname}-devel-uname-r = ${kernel_uname_r} +Provides: ${kmodname}-devel-kmod = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: ${kmodname}-devel-kmod-uname-r = ${kernel_uname_r} EOF # second part