X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=4f4773bec325dbd8e446a296f9160797fd50ed73;hb=0b063f2c200df2d28b2214b9590273568e0addca;hp=6bae9b009c4333a67c0512828bf8302f95a0727e;hpb=e7e8c3293df3252eb48bc0416507942857786c2f;p=zfsonlinux.git

diff --git a/Makefile b/Makefile
index 6bae9b0..4f4773b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,133 +1,78 @@
-RELEASE=3.3
+RELEASE=5.1
 
 # source form https://github.com/zfsonlinux/
 
-ZFSVER=0.6.3-1.2
-
-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_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}
-
-all: ${DEBS}
+ZFSVER=0.7.11
+ZFSPKGREL=pve1~bpo1
+SPLPKGREL=pve1~bpo1
+ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
+SPLPKGVER=${ZFSVER}-${SPLPKGREL}
+
+SPLDIR=spl-build
+SPLSRC=spl-debian
+ZFSDIR=zfs-build
+ZFSSRC=zfs-debian
+
+SPL_DEB = 					\
+spl_${SPLPKGVER}_amd64.deb
+
+ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB2= 					\
+libuutil1linux_${ZFSPKGVER}_amd64.deb		\
+libzfs2linux_${ZFSPKGVER}_amd64.deb		\
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
+libzpool2linux_${ZFSPKGVER}_amd64.deb		\
+zfs-dbg_${ZFSPKGVER}_amd64.deb			\
+zfs-zed_${ZFSPKGVER}_amd64.deb			\
+zfs-initramfs_${ZFSPKGVER}_all.deb		\
+zfs-test_${ZFSPKGVER}_amd64.deb		\
+zfsutils-linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
+
+DEBS=${SPL_DEB} ${ZFS_DEBS}
+
+all: deb
+deb: ${DEBS}
 
 .PHONY: dinstall
 dinstall: ${DEBS}
 	dpkg -i ${DEBS}
 
-.PHONY: spl_utils
-spl_utils ${SPL_UTILS_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 
+.PHONY: submodule
+submodule:
+	test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
+	test -f "${SPLSRC}/debian/changelog" || git submodule update --init
 
-.PHONY: spl_kmod_2.6.32
-spl_kmod_2.6.32 ${SPL_2.6.32_DEBS}: ${SPLSRC}
+.PHONY: spl
+spl: ${SPL_DEB}
+${SPL_DEB}: ${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
-	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
-
-.PHONY: download
-download:
-	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
-	rm spl-*.tar.gz
-	rm zfs-*.tar.gz
-	wget https://github.com/zfsonlinux/spl/archive/${SPLSRC}
-	wget https://github.com/zfsonlinux/zfs/archive/${ZFSSRC}
+	mkdir ${SPLDIR}
+	cp -a ${SPLSRC}/* ${SPLDIR}/
+	mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org
+	cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog
+	cd ${SPLDIR}; ln -s ../spl-patches patches
+	cd ${SPLDIR}; quilt push -a
+	cd ${SPLDIR}; rm -rf .pc ./patches
+	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
+
+.PHONY: zfs
+zfs: $(ZFS_DEBS)
+$(ZFS_DEB2): $(ZFS_DEB1)
+$(ZFS_DEB1): $(ZFSSRC)
+	rm -rf ${ZFSDIR}
+	mkdir ${ZFSDIR}
+	cp -a ${ZFSSRC}/* ${ZFSDIR}/
+	mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org
+	cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
+	cd ${ZFSDIR}; ln -s ../zfs-patches patches
+	cd ${ZFSDIR}; quilt push -a
+	cd ${ZFSDIR}; rm -rf .pc ./patches
+	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
 
 .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 *.buildinfo ${ZFSDIR} ${SPLDIR}
 
 .PHONY: distclean
 distclean: clean
@@ -135,21 +80,4 @@ distclean: clean
 
 .PHONY: upload
 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/libnvpair1_*.deb
-	rm -f /pve/${RELEASE}/extra/libuutil1_*.deb
-	rm -f /pve/${RELEASE}/extra/libzfs2_*.deb
-	rm -f /pve/${RELEASE}/extra/libzfs2-devel_*.deb
-	rm -f /pve/${RELEASE}/extra/libzpool2_*.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/Packages*
-	cp ${DEBS} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
-
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64