X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=78a834a02484c37011f44fa394702e9115fe6745;hb=f3f5ce5d7f50d2f6f6f2853e059ae8386775193d;hp=ba23d7b655b6b3fb2dad1c5eda40ac6aa2f00803;hpb=2aba4528fd1672fad8cb5843d083ef1937d7e7dd;p=zfsonlinux.git

diff --git a/Makefile b/Makefile
index ba23d7b..78a834a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,105 +1,76 @@
-RELEASE=4.1
+RELEASE=5.1
 
 # source form https://github.com/zfsonlinux/
 
-ZFSVER=0.6.5.7
-ZFSPKGREL=pve10~bpo80
-SPLPKGREL=pve6~bpo80
+ZFSVER=0.7.12
+ZFSPKGREL=pve1~bpo1
+SPLPKGREL=pve1~bpo1
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
-SPLDIR=pkg-spl
-SPLSRC=pkg-spl.tar.gz
-ZFSDIR=pkg-zfs
-ZFSSRC=pkg-zfs.tar.gz
+SPLDIR=spl-${ZFSVER}
+SPLSRC=spl/upstream
+SPLPKG=spl/debian
+ZFSDIR=zfs-${ZFSVER}
+ZFSSRC=zfs/upstream
+ZFSPKG=zfs/debian
 
-SPL_DEBS= 					\
+SPL_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_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-initramfs_${ZFSPKGVER}_amd64.deb		\
-zfsutils_${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_DEBS} ${ZFS_DEBS} 
+DEBS=${SPL_DEB} ${ZFS_DEBS}
 
-all: ${DEBS}
+all: deb
+deb: ${DEBS}
 
 .PHONY: dinstall
 dinstall: ${DEBS}
 	dpkg -i ${DEBS}
 
+.PHONY: submodule
+submodule:
+	test -f "${ZFSSRC}/README.markdown" || git submodule update --init
+	test -f "${SPLSRC}/README.markdown" || git submodule update --init
+
 .PHONY: spl
-spl ${SPL_DEBS}: ${SPLSRC}
+spl: ${SPL_DEB}
+${SPL_DEB}: ${SPLSRC}
 	rm -rf ${SPLDIR}
-	tar xf ${SPLSRC}
-	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}; ./debian/rules override_dh_prep-base-deb-files
-	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 
+	mkdir ${SPLDIR}
+	cp -a ${SPLSRC}/* ${SPLDIR}/
+	cp -a ${SPLPKG} ${SPLDIR}/debian
+	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: zfs
-zfs ${ZFS_DEBS}: ${ZFSSRC}
+zfs: $(ZFS_DEBS)
+$(ZFS_DEB2): $(ZFS_DEB1)
+$(ZFS_DEB1): $(ZFSSRC)
 	rm -rf ${ZFSDIR}
-	tar xf ${ZFSSRC}
-	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}; ./debian/rules override_dh_prep-base-deb-files
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
-
-.PHONY: download
-download:
-	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
-	# clone pkg-spl and checkout 0.6.5.7-5
-	git clone -b master/debian/jessie/0.6.5.7-5-jessie https://github.com/zfsonlinux/pkg-spl.git
-	# clone pkg-zfs and checkout 0.6.5.7-8
-	git clone -b master/debian/jessie/0.6.5.7-8-jessie https://github.com/zfsonlinux/pkg-zfs.git
-	tar czf ${SPLSRC} pkg-spl
-	tar czf ${ZFSSRC} pkg-zfs
+	mkdir ${ZFSDIR}
+	cp -a ${ZFSSRC}/* ${ZFSDIR}/
+	cp -a ${ZFSPKG} ${ZFSDIR}/debian
+	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes *.buildinfo ${ZFSDIR} ${SPLDIR}
 
 .PHONY: distclean
 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/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-dbg_*.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
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
-
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64