summaryrefslogtreecommitdiffstats
path: root/rpm
Commit message (Collapse)AuthorAgeFilesLines
* Fix various generic kmod RPM spec issues.Etienne Dechamps2013-04-241-6/+6
| | | | | | | | | | | | | | | | | | | There are a number of issues with the generic kmod RPM spec in its current state: - The "%{__id_u}" macro seems to not be available on some systems (e.g. Debian squeeze). It appears it has been deprecated. Use "${__id} -u" instead. - The way the "--with-linux=" configure option is generated in the non-RHEL/Fedora case is completely wrong with various newline and escaping issues (also, $kernel_version is not available in the generator context). The second issue made the generator shell snippet (almost) silently fail, which under specific circumstances can result in broken builds against the wrong kernel sources. Signed-off-by: Brian Behlendorf <[email protected]> Closes #1416
* Add additional dependencies for DKMS packageBrian Behlendorf2013-04-021-0/+2
| | | | | | | | | | For the DKMS package to successfully build the kernel-devel headers must be included along gcc, make, and perl. The ZFS code never directly invokes perl but the kernel build system depends on it. Signed-off-by: Brian Behlendorf <[email protected]> Closes #1380
* Only require spl-devel-kmod = %{version}Brian Behlendorf2013-04-021-1/+1
| | | | | | | | | | | | | Commit f6fb7651a0d05b357dc179cc4853263ce15da6ed introduced the idea of working builds which work correctly. However, because the zfs-kmod depends on a specific 'spl-devel-kmod = {version}-%{release}' package and the release component is unique the dependency is never satisfied. This requires line was introduced to ensure the correct version of the spl is always used. In this context only the version number is required so the release component has been dropped to satisfy the dependency. Signed-off-by: Brian Behlendorf <[email protected]>
* Tag zfs-0.6.1zfs-0.6.1Brian Behlendorf2013-03-264-9/+8
| | | | | | META file and release log updated. Signed-off-by: Brian Behlendorf <[email protected]>
* Include init scripts in packagesBrian Behlendorf2013-03-261-2/+1
| | | | | | | | | | The distribution specific init scripts where excluded from the packaging when it was reworked. The intention is to replace them with systemd equivilants. However, that work has not yet been done and the init scripts are still useful so they have been added back in to the packaging. Signed-off-by: Brian Behlendorf <[email protected]>
* Provide ${kmodname}-devel-kmod for yum-builddepBrian Behlendorf2013-03-252-2/+4
| | | | | | | | | | | | | | 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 <[email protected]>
* Remove zfs-dkms conflict with zfs-kmodBrian Behlendorf2013-03-211-1/+0
| | | | | | | | | | | | Because the zfs-dkms package also provides zfs-kmod for the zfs user package yum flags this as a conflict. To avoid the problem remove the Conflicts tag from zfs-dkms and just rely on the one in zfs-kmod. zfs-dkms-0.6.0-rc14.fc18.noarch has installed conflicts zfs-kmod: zfs-dkms-0.6.0-rc14.fc18.noarch Signed-off-by: Brian Behlendorf <[email protected]>
* Add missing dependenciesBrian Behlendorf2013-03-212-1/+4
| | | | | | | | | | The spl, zfs-test, and zfs-dracut packages should be pulled in by the core zfs package. This allows all the required zfs packages to be installed from a yum repository by running: yum install zfs Signed-off-by: Brian Behlendorf <[email protected]>
* Add spl-dkms dependency to zfs-dkmsBrian Behlendorf2013-03-191-0/+1
| | | | | | | | | | | | | | Adding the 'spl-dkms = VERSION' dependency to the zfs-dkms package ensures the spl will be installed before zfs. This cleanly handles the initial 'yum localinstall' case. However, this does not address the dkms rebuilds caused by a new kernel being installed. For that we still rely on the clunky --with-spl-timeout=<timeout> configure option which allows the zfs compilation to be briefly delayed while the spl components are built. Signed-off-by: Brian Behlendorf <[email protected]>
* Refresh RPM packagingBrian Behlendorf2013-03-1811-0/+472
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 <[email protected]> Closes #1341