set RELEASE=3.4

[zfsonlinux.git] / Makefile

diff --git a/Makefile b/Makefile
index 563b51c5db76a7b526feac4e99eafd6b57d7e9cf..aa360f6946b9816c525824983504c815365c3cfd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,30 @@
-RELEASE=3.3
+RELEASE=3.4
 
 # source form https://github.com/zfsonlinux/
 
 ZFSVER=0.6.3-1.2
-PKGREL=1~wheezy
-PKGVER=0.6.3-${PKGREL}
+ZFSPKGREL=3~wheezy
+SPLPKGREL=1~wheezy
+ZFSPKGVER=0.6.3-${ZFSPKGREL}
+SPLPKGVER=0.6.3-${SPLPKGREL}
 
 SPLDIR=spl-spl-${ZFSVER}
 SPLSRC=spl-${ZFSVER}.tar.gz
 ZFSDIR=zfs-zfs-${ZFSVER}
 ZFSSRC=zfs-${ZFSVER}.tar.gz
 
-
-#TOP=$(shell pwd)
-#KERNEL_3.10.0_HDR=/usr/src/linux-headers-3.10.0-6-pve/
-#KERNEL_2.6.32_HDR=/usr/src/linux-headers-2.6.32-35-pve/
-#KERNEL_3.10.0_SRC=${TOP}/../pve-kernel-3.10.0/linux-2.6-3.10.0/
-#KERNEL_2.6.32_SRC=${TOP}/../pve-kernel-2.6.32/linux-2.6-2.6.32
-
 SPL_DEBS=                      \
-spl_${PKGVER}_amd64.deb                \
-spl-dkms_${PKGVER}_all.deb
-
-#SPL_2.6.32_DEBS= \
-#${SPLDIR}_2.6.32/kmod-spl-devel_0.6.3-1.2_amd64.deb \
-#${SPLDIR}_2.6.32/kmod-spl-2.6.32-35-pve_0.6.3-1.2_amd64.deb \
-#${SPLDIR}_2.6.32/kmod-spl-devel-2.6.32-35-pve_0.6.3-1.2_amd64.deb
-
-#SPL_3.10.0_DEBS= \
-#${SPLDIR}_3.10.0/kmod-spl-3.10.0-6-pve_0.6.3-1.2_amd64.deb \
-#${SPLDIR}_3.10.0/kmod-spl-devel-3.10.0-6-pve_0.6.3-1.2_amd64.deb 
-
-ZFS_DEBS=                      \
-libnvpair1_0.6.3-1~wheezy_amd64.deb    \
-libuutil1_0.6.3-1~wheezy_amd64.deb     \
-libzfs2_0.6.3-1~wheezy_amd64.deb       \
-libzfs-dev_0.6.3-1~wheezy_amd64.deb    \
-libzpool2_0.6.3-1~wheezy_amd64.deb     \
-zfs-dkms_0.6.3-1~wheezy_amd64.deb      \
-zfs-doc_0.6.3-1~wheezy_amd64.deb       \
-zfs-initramfs_0.6.3-1~wheezy_amd64.deb \
-zfsutils_0.6.3-1~wheezy_amd64.deb
-
-#ZFS_2.6.32_DEBS= \
-#${ZFSDIR}_2.6.32/kmod-zfs-2.6.32-35-pve_0.6.3-1.2_amd64.deb \
-#${ZFSDIR}_2.6.32/kmod-zfs-devel_0.6.3-1.2_amd64.deb \
-#${ZFSDIR}_2.6.32/kmod-zfs-devel-2.6.32-35-pve_0.6.3-1.2_amd64.deb
-
-#ZFS_3.10.0_DEBS= \
-#${ZFSDIR}_3.10.0/kmod-zfs-3.10.0-6-pve_0.6.3-1.2_amd64.deb \
-#${ZFSDIR}_3.10.0/kmod-zfs-devel-3.10.0-6-pve_0.6.3-1.2_amd64.deb
+spl_${SPLPKGVER}_amd64.deb
+
+ZFS_DEBS=                              \
+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} 
 
@@ -59,39 +34,20 @@ all: ${DEBS}
 dinstall: ${DEBS}
        dpkg -i ${DEBS}
 
-.PHONY: spl_utils
-spl_utils ${SPL_DEBS}: ${SPLSRC}
+.PHONY: spl
+spl ${SPL_DEBS}: ${SPLSRC}
        rm -rf ${SPLDIR}
        tar xf ${SPLSRC}
        cp -a spl-debian-pve ${SPLDIR}/debian
        cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 
 
-#.PHONY: spl_kmod_2.6.32
-#spl_kmod_2.6.32 ${SPL_2.6.32_DEBS}: ${SPLSRC}
-#      rm -rf ${SPLDIR}
-#      tar xf ${SPLSRC}
-#      mv ${SPLDIR} ${SPLDIR}_2.6.32
-#      cd ${SPLDIR}_2.6.32; ./autogen.sh
-#      cd ${SPLDIR}_2.6.32; ./configure --with-linux=${KERNEL_2.6.32_HDR} --with-linux-obj=${KERNEL_2.6.32_SRC}
-#      cd ${SPLDIR}_2.6.32; make deb-kmod 
-
-.PHONY: zfs_utils
-zfs_utils ${ZFS_DEBS}: ${ZFSSRC}
+.PHONY: zfs
+zfs ${ZFS_DEBS}: ${ZFSSRC}
        rm -rf ${ZFSDIR}
        tar xf ${ZFSSRC}
        cp -a zfs-debian-pve ${ZFSDIR}/debian
        cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
 
-## Note: install mod-spl-devel-* first
-#.PHONY: zfs_kmod_2.6.32
-#zfs_kmod_2.6.32 ${ZFS_2.6.32_DEBS}: ${ZFSSRC}
-#      rm -rf ${ZFSDIR} ${ZFSDIR}_2.6.32
-#      tar xf ${ZFSSRC}
-#      mv ${ZFSDIR} ${ZFSDIR}_2.6.32
-#      cd ${ZFSDIR}_2.6.32; ./autogen.sh
-#      cd ${ZFSDIR}_2.6.32; ./configure --with-linux=${KERNEL_2.6.32_HDR} --with-linux-obj=${KERNEL_2.6.32_SRC}
-#      cd ${ZFSDIR}_2.6.32; make deb-kmod
-
 .PHONY: download
 download:
        #git clone https://github.com/zfsonlinux/pkg-spl.git
@@ -116,13 +72,22 @@ upload: ${DEBS}
        umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
        mkdir -p /pve/${RELEASE}/extra
        rm -f /pve/${RELEASE}/extra/spl_*.deb
-       rm -f /pve/${RELEASE}/extra/kmod-spl-*.deb
+       rm -f /pve/${RELEASE}/extra/spl-dkms_*.deb
        rm -f /pve/${RELEASE}/extra/libnvpair1_*.deb
+       rm -f /pve/${RELEASE}/extra/libnvpair1-dbg_*.deb
        rm -f /pve/${RELEASE}/extra/libuutil1_*.deb
+       rm -f /pve/${RELEASE}/extra/libuutil1-dbg_*.deb
        rm -f /pve/${RELEASE}/extra/libzfs2_*.deb
        rm -f /pve/${RELEASE}/extra/libzfs2-dbg_*.deb
+       rm -f /pve/${RELEASE}/extra/libzfs-dev_*.deb
        rm -f /pve/${RELEASE}/extra/libzpool2_*.deb
+       rm -f /pve/${RELEASE}/extra/libzpool2-dbg_*.deb
        rm -f /pve/${RELEASE}/extra/zfs_*.deb
+       rm -f /pve/${RELEASE}/extra/zfs-dkms_*.deb
+       rm -f /pve/${RELEASE}/extra/zfs-doc_*.deb
+       rm -f /pve/${RELEASE}/extra/zfs-initramfs_*.deb
+       rm -f /pve/${RELEASE}/extra/zfsutils_*.deb
+       rm -f /pve/${RELEASE}/extra/zfsutils-dbg_*.deb
        rm -f /pve/${RELEASE}/extra/Packages*
        cp ${DEBS} /pve/${RELEASE}/extra
        cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz