update to 0.6.5.4

[zfsonlinux.git] / Makefile

diff --git a/Makefile b/Makefile
index cc304db131b92000dc18b5ebf0860b86f4a6e807..38bfd8b47fb3efb2012aed379f341cf993a676a2 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.5
-ZFSPKGREL=1~wheezy
-SPLPKGREL=1~wheezy
+ZFSPKGREL=2~wheezy
+SPLPKGREL=2~wheezy
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
@@ -65,15 +65,26 @@ 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
-       #cd pkg-spl; git fetch --tags
+       cd pkg-spl; git checkout spl-0.6.5-release
+       cd pkg-spl; git pull --no-edit git://github.com/zfsonlinux/spl.git spl-0.6.5-release
        cd pkg-spl; git checkout master/debian/wheezy/0.6.5-1-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"
+       # manual merge spl-0.6.5-release
+       cd pkg-spl; git merge --no-edit spl-0.6.5-release
        git clone https://github.com/zfsonlinux/pkg-zfs.git
-       cd pkg-zfs; git checkout master/debian/wheezy/0.6.5.2-2-wheezy 
+       cd pkg-zfs; git checkout -b zfs-0.6.5.4
+       cd pkg-zfs; git pull --no-edit git://github.com/zfsonlinux/zfs.git zfs-0.6.5-release
+       cp pkg-zfs/etc/init.d/zfs-import.in zfs-import.in.backup
+       cd pkg-zfs; git checkout master/debian/wheezy/0.6.5.2-2-wheezy
+       mkdir pkg-zfs/etc/init.d/
+       # hack to resolve merger conflict
+       cp zfs-import.in.backup pkg-zfs/etc/init.d/zfs-import.in
+       cd pkg-zfs; git add etc/init.d/zfs-import.in; git commit -m "fake add to allow merge"
+       # ignore etc/init.d/zfs-import.in
+       cd pkg-zfs; git merge --no-edit zfs-0.6.5.4
+       # remove stale file after merge
+       rm pkg-zfs/etc/init.d/zfs-import.in;
+       rmdir pkg-zfs/etc/init.d
+       rm zfs-import.in.backup
        tar czf ${SPLSRC} pkg-spl
        tar czf ${ZFSSRC} pkg-zfs