From f3757573a677e8662e268f0bb8e5ffe750013088 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Sun, 17 Feb 2013 12:10:17 -0800 Subject: Refresh RPM packaging Refresh the existing RPM packaging to conform to the 'Fedora Packaging Guidelines'. This includes adopting the kmods2 packaging standard which is used fod kmods distributed by rpmfusion for Fedora/RHEL. http://fedoraproject.org/wiki/Packaging:Guidelines http://rpmfusion.org/Packaging/KernelModules/Kmods2 While the spec files have been entirely rewritten from a user perspective the only major changes are: * The Fedora packages now have a build dependency on the rpmfusion repositories. The generic kmod packages also have a new dependency on kmodtool-1.22 but it is bundled with the source rpm so no additional packages are needed. * The kernel binary module packages have been renamed from zfs-modules-* to kmod-zfs-* as specificed by kmods2. * The is now a common kmod-zfs-devel-* package in addition to the per-kernel devel packages. The common package contains the development headers while the per-kernel package contains kernel specific build products. Signed-off-by: Brian Behlendorf Closes #1341 --- rpm/fedora/.gitignore | 3 ++ rpm/fedora/Makefile.am | 1 + rpm/fedora/zfs-dkms.spec.in | 1 + rpm/fedora/zfs-kmod.spec.in | 117 ++++++++++++++++++++++++++++++++++++++++++++ rpm/fedora/zfs.spec.in | 1 + 5 files changed, 123 insertions(+) create mode 100644 rpm/fedora/.gitignore create mode 100644 rpm/fedora/Makefile.am create mode 120000 rpm/fedora/zfs-dkms.spec.in create mode 100644 rpm/fedora/zfs-kmod.spec.in create mode 120000 rpm/fedora/zfs.spec.in (limited to 'rpm/fedora') diff --git a/rpm/fedora/.gitignore b/rpm/fedora/.gitignore new file mode 100644 index 000000000..7f5daafdd --- /dev/null +++ b/rpm/fedora/.gitignore @@ -0,0 +1,3 @@ +/zfs-dkms.spec +/zfs-kmod.spec +/zfs.spec diff --git a/rpm/fedora/Makefile.am b/rpm/fedora/Makefile.am new file mode 100644 index 000000000..89b13640d --- /dev/null +++ b/rpm/fedora/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = zfs.spec.in zfs-kmod.spec.in zfs-dkms.spec.in diff --git a/rpm/fedora/zfs-dkms.spec.in b/rpm/fedora/zfs-dkms.spec.in new file mode 120000 index 000000000..ffa051baa --- /dev/null +++ b/rpm/fedora/zfs-dkms.spec.in @@ -0,0 +1 @@ +../generic/zfs-dkms.spec.in \ No newline at end of file diff --git a/rpm/fedora/zfs-kmod.spec.in b/rpm/fedora/zfs-kmod.spec.in new file mode 100644 index 000000000..ac5f42a24 --- /dev/null +++ b/rpm/fedora/zfs-kmod.spec.in @@ -0,0 +1,117 @@ +%define module @PACKAGE@ +%define repo rpmfusion + +%define buildforkernels newest +#define buildforkernels current +#define buildforkernels akmod + +%bcond_with debug +%bcond_with debug_dmu_tx + + +Name: %{module}-kmod + +Version: @VERSION@ +Release: @RELEASE@%{?dist} +Summary: Kernel module(s) + +Group: System Environment/Kernel +License: @ZFS_META_LICENSE@ +URL: http://zfsonlinux.org/ +Source0: %{module}-%{version}.tar.gz +Source10: kmodtool +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExclusiveArch: i586 i686 x86_64 + +# Likely compiles but is not supported. +ExcludeArch: ppc ppc64 + +# The developments headers will conflict with the dkms packages. +Conflicts: %{module}-dkms + +BuildRequires: %{_bindir}/kmodtool + +%global KmodsBuildRequires kmod-spl-devel +%global KmodsRequires kmod-spl + +%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } + +%if 0%{?fedora} >= 17 +%define prefix /usr +%endif + +# Kmodtool does its magic here. A patched version of kmodtool is shipped +# with the source rpm until kmod development packages are supported upstream. +# https://bugzilla.rpmfusion.org/show_bug.cgi?id=2714 +%{expand:%(sh %{SOURCE10} --target %{_target_cpu} --repo %{repo} --kmodname %{name} --devel %{?prefix:--prefix "%{?prefix}"} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + + +%description +This package contains the ZFS kernel modules. + +%prep +# Error out if there was something wrong with kmodtool. +%{?kmodtool_check} + +# Print kmodtool output for debugging purposes: +sh %{SOURCE10} --target %{_target_cpu} --repo %{repo} --kmodname %{name} --devel %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%if %{with debug} + %define debug --enable-debug +%else + %define debug --disable-debug +%endif + +%if %{with debug_dmu_tx} + %define debug_dmu_tx --enable-debug-dmu-tx +%else + %define debug_dmu_tx --disable-debug-dmu-tx +%endif + +# Leverage VPATH from configure to avoid making multiple copies. +%define _configure ../%{module}-%{version}/configure + +%setup -q -c -T -a 0 + +for kernel_version in %{?kernel_versions}; do + %{__mkdir} _kmod_build_${kernel_version%%___*} +done + +%build +for kernel_version in %{?kernel_versions}; do + pushd _kmod_build_${kernel_version%%___*} + %configure \ + --with-config=kernel \ + --with-linux="${kernel_version##*___}" \ + --with-linux-obj="${kernel_version##*___}" \ + --with-spl="/usr/src/spl-%{version}" \ + --with-spl-obj="/usr/src/spl-%{version}/${kernel_version%%___*}" \ + %{debug} \ + %{debug_dmu_tx} + make %{?_smp_mflags} + popd +done + + +%install +rm -rf ${RPM_BUILD_ROOT} + +# Relies on the kernel 'modules_install' make target. +for kernel_version in %{?kernel_versions}; do + pushd _kmod_build_${kernel_version%%___*} + make install \ + DESTDIR=${RPM_BUILD_ROOT} \ + %{?prefix:INSTALL_MOD_PATH=%{?prefix}} \ + INSTALL_MOD_DIR=%{kmodinstdir_postfix} + popd +done +chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/* +%{?akmod_install} + + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Tue Mar 12 2013 Brian Behlendorf - 0.6.0-1 +- Initial kmods2 packaging. diff --git a/rpm/fedora/zfs.spec.in b/rpm/fedora/zfs.spec.in new file mode 120000 index 000000000..4c8079166 --- /dev/null +++ b/rpm/fedora/zfs.spec.in @@ -0,0 +1 @@ +../generic/zfs.spec.in \ No newline at end of file -- cgit v1.2.3