Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2013-03-25 11:28:18 -07:00
parent f6fb7651a0
commit 0df23ca9a1
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rpm/fedora/zfs-kmod.spec.in
View File

@ -30,8 +30,9 @@ ExcludeArch: ppc ppc64
Conflicts: %{module}-dkms Conflicts: %{module}-dkms
BuildRequires: %{_bindir}/kmodtool BuildRequires: %{_bindir}/kmodtool
BuildRequires: spl-devel-kmod = %{version}-%{release}
%global KmodsBuildRequires kmod-spl-devel %global KmodsBuildRequires spl-devel-kmod
%global KmodsRequires kmod-spl %global KmodsRequires kmod-spl
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }

3
rpm/generic/zfs-kmod.spec.in
View File

@ -26,7 +26,8 @@ Conflicts: %{module}-dkms
%{?suse_version:BuildRequires: kernel-source} %{?suse_version:BuildRequires: kernel-source}
%if 0%{?rhel}%{?fedora}%{?suse_version} %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 %global KmodsRequires kmod-spl
%endif %endif

3
scripts/kmodtool
View File

@ -243,7 +243,8 @@ print_rpmtemplate_per_kmoddevelpkg ()
Summary: ${kmodname} kernel module(s) devel for ${kernel_uname_r} Summary: ${kmodname} kernel module(s) devel for ${kernel_uname_r}
Group: System Environment/Kernel Group: System Environment/Kernel
Requires: ${kmodname}-devel-kmod-common = %{?epoch:%{epoch}:}%{version}-%{release} 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 EOF
# second part # second part