-RELEASE=3.3
+RELEASE=3.4
# source form https://github.com/zfsonlinux/
ZFSVER=0.6.3-1.2
+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)
+SPL_DEBS= \
+spl_${SPLPKGVER}_amd64.deb
-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
+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
-SPL_UTILS_DEBS= \
-${SPLDIR}_utils/spl_0.6.3-1.2_amd64.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_UTILS_DEBS= \
-${ZFSDIR}_utils/libnvpair1_0.6.3-1.2_amd64.deb \
-${ZFSDIR}_utils/libuutil1_0.6.3-1.2_amd64.deb \
-${ZFSDIR}_utils/libzfs2_0.6.3-1.2_amd64.deb \
-${ZFSDIR}_utils/libzfs2-devel_0.6.3-1.2_amd64.deb \
-${ZFSDIR}_utils/libzpool2_0.6.3-1.2_amd64.deb \
-${ZFSDIR}_utils/zfs_0.6.3-1.2_amd64.deb \
-${ZFSDIR}_utils/zfs-dracut_0.6.3-1.2_amd64.deb \
-${ZFSDIR}_utils/zfs-test_0.6.3-1.2_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
-
-DEBS=${SPL_UTILS_DEBS} ${SPL_2.6.32_DEBS} ${SPL_3.10.0_DEBS} ${ZFS_UTILS_DEBS} ${ZFS_2.6.32_DEBS} ${ZFS_3.10.0_DEBS}
+DEBS=${SPL_DEBS} ${ZFS_DEBS}
all: ${DEBS}
dinstall: ${DEBS}
dpkg -i ${DEBS}
-.PHONY: spl_utils
-spl_utils ${SPL_UTILS_DEBS}: ${SPLSRC}
+.PHONY: spl
+spl ${SPL_DEBS}: ${SPLSRC}
rm -rf ${SPLDIR}
tar xf ${SPLSRC}
- mv ${SPLDIR} ${SPLDIR}_utils
- cd ${SPLDIR}_utils; ./autogen.sh
- cd ${SPLDIR}_utils; ./configure --with-linux=${KERNEL_2.6.32_HDR} --with-linux-obj=${KERNEL_2.6.32_SRC}
- cd ${SPLDIR}_utils; make deb-utils
+ 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: spl_kmod_3.10.0
-spl_kmod_3.10.0 ${SPL_3.10.0_DEBS}: ${SPLSRC}
- rm -rf ${SPLDIR}
- tar xf ${SPLSRC}
- mv ${SPLDIR} ${SPLDIR}_3.10.0
- cd ${SPLDIR}_3.10.0; ./autogen.sh
- cd ${SPLDIR}_3.10.0; ./configure --with-linux=${KERNEL_3.10.0_HDR} --with-linux-obj=${KERNEL_3.10.0_SRC}
- cd ${SPLDIR}_3.10.0; make deb-kmod
-
-.PHONY: zfs_utils
-zfs_utils ${ZFS_UTILS_DEBS}: ${ZFSSRC}
- rm -rf ${ZFSDIR} ${ZFSDIR}_utils
- tar xf ${ZFSSRC}
- mv ${ZFSDIR} ${ZFSDIR}_utils
- cd ${ZFSDIR}_utils; ./autogen.sh
- cd ${ZFSDIR}_utils; ./configure --with-linux=${KERNEL_2.6.32_HDR} --with-linux-obj=${KERNEL_2.6.32_SRC}
- cd ${ZFSDIR}_utils; make deb-utils
-
-# 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
-
-# Note: install mod-spl-devel-* first
-.PHONY: zfs_kmod_3.10.0
-zfs_kmod_3.10.0 ${ZFS_3.10.0_DEBS}: ${ZFSSRC}
- rm -rf ${ZFSDIR} ${ZFSDIR}_3.10.0
+.PHONY: zfs
+zfs ${ZFS_DEBS}: ${ZFSSRC}
+ rm -rf ${ZFSDIR}
tar xf ${ZFSSRC}
- mv ${ZFSDIR} ${ZFSDIR}_3.10.0
- cd ${ZFSDIR}_3.10.0; ./autogen.sh
- cd ${ZFSDIR}_3.10.0; ./configure --with-linux=${KERNEL_3.10.0_HDR} --with-linux-obj=${KERNEL_3.10.0_SRC}
- cd ${ZFSDIR}_3.10.0; make deb-kmod
+ cp -a zfs-debian-pve ${ZFSDIR}/debian
+ cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
.PHONY: download
download:
- git clone https://github.com/zfsonlinux/pkg-spl.git
+ #git clone https://github.com/zfsonlinux/pkg-spl.git
#git clone https://github.com/zfsonlinux/pkg-zfs.git
- #cd pkg-zfs; git checkout upstream
- #cd pkg-zfs; git checkout master/ubuntu/precise
- #git checkout master/debian/wheezy
- #git merge upstream
- dsaf
+ ##git checkout master/ubuntu/precise
+ ##git checkout master/debian/wheezy
rm spl-*.tar.gz
rm zfs-*.tar.gz
wget https://github.com/zfsonlinux/spl/archive/${SPLSRC}
.PHONY: clean
clean:
- rm -rf *~ *.deb *.changes ${ZFSDIR} ${ZFSDIR}_utils ${ZFSDIR}_2.6.32 ${ZFSDIR}_3.10.0 ${SPLDIR} ${SPLDIR}_utils ${SPLDIR}_2.6.32 ${SPLDIR}_3.10.0
+ rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
.PHONY: distclean
distclean: clean
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-devel_*.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-dracut_*.deb
- rm -f /pve/${RELEASE}/extra/zfs-test_*.deb
- rm -f /pve/${RELEASE}/extra/kmod-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