From e34fbf907c3e9c8b9dfad5e11dbf5dcd9dd9618d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 28 Jun 2016 13:49:32 +0200 Subject: [PATCH] update to zfs/spl 0.6.5.7 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 --- Makefile | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index f160fab..44a5d83 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ RELEASE=3.4 # also update version in # zfs-changelog.Debian and spl-changelog.Debian -ZFSVER=0.6.5 -ZFSPKGREL=3~wheezy -SPLPKGREL=3~wheezy +ZFSVER=0.6.5.7 +ZFSPKGREL=4~bpo70 +SPLPKGREL=4~bpo70 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL} SPLPKGVER=${ZFSVER}-${SPLPKGREL} @@ -63,27 +63,8 @@ zfs ${ZFS_DEBS}: ${ZFSSRC} .PHONY: download 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 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 + git clone -b master/debian/wheezy/0.6.5.7-3-wheezy 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 tar czf ${SPLSRC} pkg-spl tar czf ${ZFSSRC} pkg-zfs