summaryrefslogtreecommitdiffstats
path: root/config/tgz.am
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2013-02-17 12:10:17 -0800
committerBrian Behlendorf <[email protected]>2013-03-18 15:33:17 -0700
commitf3757573a677e8662e268f0bb8e5ffe750013088 (patch)
treea0001b1a30360d4b85f5b5e2a7229697eae6704f /config/tgz.am
parent9b2af9a097c119b818bd584eb89ca51ba475c7f2 (diff)
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 <[email protected]> Closes #1341
Diffstat (limited to 'config/tgz.am')
-rw-r--r--config/tgz.am20
1 files changed, 9 insertions, 11 deletions
diff --git a/config/tgz.am b/config/tgz.am
index 1ed09ca40..2997b1de2 100644
--- a/config/tgz.am
+++ b/config/tgz.am
@@ -7,22 +7,20 @@ tgz-local:
exit 1; \
fi)
-tgz-modules: tgz-local rpm-modules
+tgz-kmod: tgz-local rpm-kmod
if CONFIG_KERNEL
- name=${PACKAGE}-modules; \
- version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \
- release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \
- arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
- pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \
- pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \
- fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2; \
- $(RM) $$pkg1 $$pkg2
+ name=${PACKAGE}; \
+ version=${VERSION}-${RELEASE}; \
+ arch=`$(RPM) -qp $${name}-kmod-$${version}.src.rpm --qf %{arch} | tail -1`; \
+ pkg1=kmod-$${name}*$${version}.$${arch}.rpm; \
+ fakeroot $(ALIEN) --scripts --to-tgz $$pkg1; \
+ $(RM) $$pkg1
endif
tgz-utils: tgz-local rpm-utils
if CONFIG_USER
name=${PACKAGE}; \
- version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \
+ version=${VERSION}-${RELEASE}; \
arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
pkg1=$${name}-$${version}.$${arch}.rpm; \
pkg2=$${name}-devel-$${version}.$${arch}.rpm; \
@@ -31,4 +29,4 @@ if CONFIG_USER
$(RM) $$pkg1 $$pkg2 $$pkg3
endif
-tgz: tgz-modules tgz-utils
+tgz: tgz-kmod tgz-utils