[pve-devel] [PATCH v2 zfsonlinux 1/2] Update pkg-spl to jessie/0.6.5.6-3

Fabian Grünbichler f.gruenbichler at proxmox.com
Fri Apr 15 11:02:47 CEST 2016


---
 Makefile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index a140990..29f92bc 100644
--- a/Makefile
+++ b/Makefile
@@ -61,12 +61,8 @@ zfs ${ZFS_DEBS}: ${ZFSSRC}
 .PHONY: download
 download:
 	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
-	git clone https://github.com/zfsonlinux/pkg-spl.git
-	# list tags with:  git tag --list 'master/*'
-	cd pkg-spl; git fetch https://github.com/zfsonlinux/spl.git spl-0.6.5-release
-	cd pkg-spl; git checkout master/debian/jessie/0.6.5-1
-	# manual merge spl-0.6.5.6
-	cd pkg-spl; git merge --no-edit spl-0.6.5.6
+	# clone pkg-spl and checkout 0.6.5.6-3
+	git clone -b master/debian/jessie/0.6.5.6-3 https://github.com/zfsonlinux/pkg-spl.git
 	# clone pkg-zfs and checkout 0.6.5.6-3
 	git clone -b master/debian/jessie/0.6.5.6-3 https://github.com/zfsonlinux/pkg-zfs.git
 	tar czf ${SPLSRC} pkg-spl
-- 
2.1.4




More information about the pve-devel mailing list