update to 0.6.4.2

[zfsonlinux.git] / Makefile

diff --git a/Makefile b/Makefile
index 98dc0ff0e4413a3e0019d540be7fe5ab4d9184f9..411ab001316ef526509e9852cffa6cc09235d012 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ RELEASE=3.4
 # also update version in 
 # zfs-changelog.Debian and spl-changelog.Debian
 ZFSVER=0.6.4
-ZFSPKGREL=3~wheezy
-SPLPKGREL=3~wheezy
+ZFSPKGREL=4~wheezy
+SPLPKGREL=4~wheezy
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
@@ -65,13 +65,15 @@ download:
        rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
        # list tags with:  git tag --list 'master/*'
        git clone https://github.com/zfsonlinux/pkg-spl.git
-       # udate manually to 0.6.4.1 for now
-       cd pkg-spl; git checkout upstream
-       cd pkg-spl; git pull git://github.com/zfsonlinux/spl.git master
-       cd pkg-spl; git checkout master/debian/wheezy/0.6.4-1-wheezy
-       cd pkg-spl; git merge upstream -m "merge upstream"
+       #cd pkg-spl; git fetch --tags
+       cd pkg-spl; git checkout snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy
+       ## udate manually to 0.6.4.1 for now
+       #cd pkg-spl; git checkout upstream
+       #cd pkg-spl; git pull git://github.com/zfsonlinux/spl.git master
+       #cd pkg-spl; git checkout master/debian/wheezy/0.6.4-1-wheezy
+       #cd pkg-spl; git        merge upstream -m "merge upstream"
        git clone https://github.com/zfsonlinux/pkg-zfs.git
-       cd pkg-zfs; git checkout master/debian/wheezy/0.6.4-1.1-1-wheezy
+       cd pkg-zfs; git checkout snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy 
        tar czf ${SPLSRC} pkg-spl
        tar czf ${ZFSSRC} pkg-zfs