From 479d451f641b441ab49c263530ea4b5d9e04cbc3 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 14 Jan 2015 19:38:09 +0100 Subject: [PATCH] allow different package versions for spl and zfs --- Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index cd254e2..7cf2898 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,10 @@ RELEASE=3.3 # source form https://github.com/zfsonlinux/ ZFSVER=0.6.3-1.2 -PKGREL=2~wheezy -PKGVER=0.6.3-${PKGREL} +ZFSPKGREL=2~wheezy +SPLPKGREL=1~wheezy +ZFSPKGVER=0.6.3-${ZFSPKGREL} +SPLPKGVER=0.6.3-${SPLPKGREL} SPLDIR=spl-spl-${ZFSVER} SPLSRC=spl-${ZFSVER}.tar.gz @@ -12,17 +14,17 @@ ZFSDIR=zfs-zfs-${ZFSVER} ZFSSRC=zfs-${ZFSVER}.tar.gz SPL_DEBS= \ -spl_${PKGVER}_amd64.deb +spl_${SPLPKGVER}_amd64.deb ZFS_DEBS= \ -libnvpair1_${PKGVER}_amd64.deb \ -libuutil1_${PKGVER}_amd64.deb \ -libzfs2_${PKGVER}_amd64.deb \ -libzfs-dev_${PKGVER}_amd64.deb \ -libzpool2_${PKGVER}_amd64.deb \ -zfs-doc_${PKGVER}_amd64.deb \ -zfs-initramfs_${PKGVER}_amd64.deb \ -zfsutils_${PKGVER}_amd64.deb +libnvpair1_${ZFSPKGVER}_amd64.deb \ +libuutil1_${ZFSPKGVER}_amd64.deb \ +libzfs2_${ZFSPKGVER}_amd64.deb \ +libzfs-dev_${ZFSPKGVER}_amd64.deb \ +libzpool2_${ZFSPKGVER}_amd64.deb \ +zfs-doc_${ZFSPKGVER}_amd64.deb \ +zfs-initramfs_${ZFSPKGVER}_amd64.deb \ +zfsutils_${ZFSPKGVER}_amd64.deb DEBS=${SPL_DEBS} ${ZFS_DEBS}