From 8155ecfe17cb93861eed62586ebe1b544eb9ea4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 15 Apr 2016 11:02:47 +0200 Subject: [PATCH] Update pkg-spl to jessie/0.6.5.6-3 --- 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