c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include important patches from 0.6.5.3

Browse Source
This commit is contained in:
Dietmar Maurer
2015-11-04 17:43:26 +01:00
parent 944a4708cf
commit bc3a2de1e1
5 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+6 -2
View File
@@ -3,8 +3,8 @@ RELEASE=4.0
# source form https://github.com/zfsonlinux/
ZFSVER=0.6.5
ZFSPKGREL=pve4~jessie
SPLPKGREL=pve1~jessie
ZFSPKGREL=pve5~jessie
SPLPKGREL=pve2~jessie
ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
SPLPKGVER=${ZFSVER}-${SPLPKGREL}
@@ -65,7 +65,11 @@ download:
git clone https://github.com/zfsonlinux/pkg-zfs.git
# list tags with: git tag --list 'master/*'
cd pkg-spl; git checkout master/debian/jessie/0.6.5-1
# manual merge spl-0.6.5.3
cd pkg-spl; git merge --no-edit spl-0.6.5.3
cd pkg-zfs; git checkout master/debian/jessie/0.6.5.2-2
# manual cherry-pick relevant 0.6.5.3 updates
cd pkg-zfs; git cherry-pick cd887ab869bb506c88a66ba8c225ca42680b89d f9f5394f74f7bf421eb484e8d1653257d92f5ace
tar czf ${SPLSRC} pkg-spl
tar czf ${ZFSSRC} pkg-zfs