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

update to zfs/spl 0.6.5.7

Browse Source 
update pkg-zfs to zfs-0.6.5.7-8-wheezy
update pkg-spl to spl-0.6.5.7-3-wheezy

change package versioning scheme

drop cherry-pick workarounds
This commit is contained in:
Fabian Grünbichler 2016-06-28 13:49:32 +02:00
parent a96c6ce442
commit e34fbf907c
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@ -4,9 +4,9 @@ RELEASE=3.4
# also update version in # also update version in
# zfs-changelog.Debian and spl-changelog.Debian # zfs-changelog.Debian and spl-changelog.Debian
ZFSVER=0.6.5 ZFSVER=0.6.5.7
ZFSPKGREL=3~wheezy ZFSPKGREL=4~bpo70
SPLPKGREL=3~wheezy SPLPKGREL=4~bpo70
ZFSPKGVER=${ZFSVER}-${ZFSPKGREL} ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
SPLPKGVER=${ZFSVER}-${SPLPKGREL} SPLPKGVER=${ZFSVER}-${SPLPKGREL}
@ -63,27 +63,8 @@ zfs ${ZFS_DEBS}: ${ZFSSRC}
.PHONY: download .PHONY: download
download: download:
rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC} rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
# list tags with: git tag --list 'master/*' git clone -b master/debian/wheezy/0.6.5.7-3-wheezy https://github.com/zfsonlinux/pkg-spl.git
git clone https://github.com/zfsonlinux/pkg-spl.git git clone -b master/debian/wheezy/0.6.5.7-8-wheezy https://github.com/zfsonlinux/pkg-zfs.git
cd pkg-spl; git fetch https://github.com/zfsonlinux/spl.git spl-0.6.5-release
cd pkg-spl; git checkout master/debian/wheezy/0.6.5-1-wheezy
# manual merge spl-0.6.5.6
cd pkg-spl; git merge --no-edit spl-0.6.5.6
git clone https://github.com/zfsonlinux/pkg-zfs.git
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.6
# 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 ${SPLSRC} pkg-spl
tar czf ${ZFSSRC} pkg-zfs tar czf ${ZFSSRC} pkg-zfs