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

update to 0.6.5.2

Browse Source
This commit is contained in:
Dietmar Maurer 2015-10-09 10:25:57 +02:00
parent 69aebd7324
commit 8b01c7a110
7 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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.4 ZFSVER=0.6.5
ZFSPKGREL=4~wheezy ZFSPKGREL=1~wheezy
SPLPKGREL=4~wheezy SPLPKGREL=1~wheezy
ZFSPKGVER=${ZFSVER}-${ZFSPKGREL} ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
SPLPKGVER=${ZFSVER}-${SPLPKGREL} SPLPKGVER=${ZFSVER}-${SPLPKGREL}
@ -66,14 +66,14 @@ download:
# list tags with: git tag --list 'master/*' # list tags with: git tag --list 'master/*'
git clone https://github.com/zfsonlinux/pkg-spl.git git clone https://github.com/zfsonlinux/pkg-spl.git
#cd pkg-spl; git fetch --tags #cd pkg-spl; git fetch --tags
cd pkg-spl; git checkout snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy cd pkg-spl; git checkout master/debian/wheezy/0.6.5-1-wheezy
## udate manually to 0.6.4.1 for now ## udate manually to 0.6.4.1 for now
#cd pkg-spl; git checkout upstream #cd pkg-spl; git checkout upstream
#cd pkg-spl; git pull git://github.com/zfsonlinux/spl.git master #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 checkout master/debian/wheezy/0.6.4-1-wheezy
#cd pkg-spl; git merge upstream -m "merge upstream" #cd pkg-spl; git merge upstream -m "merge upstream"
git clone https://github.com/zfsonlinux/pkg-zfs.git git clone https://github.com/zfsonlinux/pkg-zfs.git
cd pkg-zfs; git checkout snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy cd pkg-zfs; git checkout master/debian/wheezy/0.6.5.2-2-wheezy
tar czf ${SPLSRC} pkg-spl tar czf ${SPLSRC} pkg-spl
tar czf ${ZFSSRC} pkg-zfs tar czf ${ZFSSRC} pkg-zfs

BIN
pkg-spl.tar.gz
View File

Binary file not shown.

BIN
pkg-zfs.tar.gz
View File

Binary file not shown.

6
spl-changelog.Debian
View File

@ -1,3 +1,9 @@
spl-linux (0.6.5-1~wheezy) unstable; urgency=low
* update to master/debian/wheezy/0.6.5-1-wheezy
-- Proxmox Support Team <support@proxmox.com> Fri, 09 Oct 2015 10:03:25 +0200
spl-linux (0.6.4-4~wheezy) unstable; urgency=low spl-linux (0.6.4-4~wheezy) unstable; urgency=low
* update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy) * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy)

16
spl-patches/fix-control
View File

@ -1,7 +1,7 @@
Index: pkg-spl/debian/rules Index: new/debian/rules
=================================================================== ===================================================================
--- pkg-spl.orig/debian/rules 2015-07-21 07:14:29.000000000 +0200 --- new.orig/debian/rules 2015-10-09 10:02:21.000000000 +0200
+++ pkg-spl/debian/rules 2015-07-21 07:28:47.000000000 +0200 +++ new/debian/rules 2015-10-09 10:12:04.000000000 +0200
@@ -22,9 +22,7 @@ @@ -22,9 +22,7 @@
KVERS=$(shell uname -r | sed 's/-$(DEB_HOST_ARCH)//') KVERS=$(shell uname -r | sed 's/-$(DEB_HOST_ARCH)//')
endif endif
@ -82,11 +82,11 @@ Index: pkg-spl/debian/rules
override_dh_dkms: override_dh_dkms:
dh_dkms -V $(VERSION) dh_dkms -V $(VERSION)
Index: pkg-spl/debian/control.in Index: new/debian/control.in
=================================================================== ===================================================================
--- pkg-spl.orig/debian/control.in 2015-07-21 07:14:29.000000000 +0200 --- new.orig/debian/control.in 2015-10-09 10:02:21.000000000 +0200
+++ pkg-spl/debian/control.in 2015-07-21 07:19:42.000000000 +0200 +++ new/debian/control.in 2015-10-09 10:12:44.000000000 +0200
@@ -33,28 +33,6 @@ @@ -35,30 +35,6 @@
This package provides the source to the SPL kernel module in a form This package provides the source to the SPL kernel module in a form
suitable for use by module-assistant or kernel-package. suitable for use by module-assistant or kernel-package.
@ -95,6 +95,8 @@ Index: pkg-spl/debian/control.in
-Depends: linux-headers-amd64, libc6-dev, ${misc:Depends}, dkms (>> 2.1.1.2-5), lsb-release, file -Depends: linux-headers-amd64, libc6-dev, ${misc:Depends}, dkms (>> 2.1.1.2-5), lsb-release, file
-Recommends: spl (>= ${source:Upstream-Version}) -Recommends: spl (>= ${source:Upstream-Version})
-Provides: spl-modules -Provides: spl-modules
-Conflicts: spl-modules-source
-Replaces: spl-modules-source
-Description: Solaris Porting Layer kernel modules for Linux -Description: Solaris Porting Layer kernel modules for Linux
- The Solaris Porting Layer (SPL) is a Linux kernel module which provides - The Solaris Porting Layer (SPL) is a Linux kernel module which provides
- many of the Solaris kernel APIs. This shim layer makes it possible to - many of the Solaris kernel APIs. This shim layer makes it possible to

6
zfs-changelog.Debian
View File

@ -1,3 +1,9 @@
zfs-linux (0.6.5-1~wheezy) unstable; urgency=low
* update to master/debian/wheezy/0.6.5.2-2-wheezy
-- Proxmox Support Team <support@proxmox.com> Fri, 09 Oct 2015 10:04:04 +0200
zfs-linux (0.6.4-4~wheezy) unstable; urgency=low zfs-linux (0.6.4-4~wheezy) unstable; urgency=low
* update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy) * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy)

20
zfs-patches/fix-control.patch
View File

@ -1,8 +1,8 @@
Index: pkg-zfs/debian/control.in Index: new/debian/control.in
=================================================================== ===================================================================
--- pkg-zfs.orig/debian/control.in 2015-07-21 07:14:46.000000000 +0200 --- new.orig/debian/control.in 2015-10-09 10:02:40.000000000 +0200
+++ pkg-zfs/debian/control.in 2015-07-21 07:48:21.000000000 +0200 +++ new/debian/control.in 2015-10-09 10:15:36.000000000 +0200
@@ -102,39 +102,9 @@ @@ -104,39 +104,9 @@
This package provides the source to the SPL kernel module in a form This package provides the source to the SPL kernel module in a form
suitable for use by module-assistant or kernel-package. suitable for use by module-assistant or kernel-package.
@ -11,9 +11,9 @@ Index: pkg-zfs/debian/control.in
-Pre-Depends: spl-dkms -Pre-Depends: spl-dkms
-Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}, file -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}, file
-Recommends: zfsutils -Recommends: zfsutils
-Replaces: lzfs, lzfs-dkms -Replaces: lzfs, lzfs-dkms, zfs-modules-source
-Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules, zfs-modules-source -Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules, zfs-modules-source
-Conflicts: lzfs, lzfs-dkms -Conflicts: lzfs, lzfs-dkms, zfs-modules-source
-Description: Native ZFS filesystem kernel modules for Linux -Description: Native ZFS filesystem kernel modules for Linux
- The Z file system is a pooled filesystem designed for maximum data - The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data - integrity, supporting data snapshots, multiple copies, and data
@ -42,7 +42,7 @@ Index: pkg-zfs/debian/control.in
zfsutils, ${misc:Depends} zfsutils, ${misc:Depends}
Description: Native ZFS root filesystem capabilities for Linux Description: Native ZFS root filesystem capabilities for Linux
The Z file system is a pooled filesystem designed for maximum data The Z file system is a pooled filesystem designed for maximum data
@@ -148,7 +118,6 @@ @@ -150,7 +120,6 @@
Section: admin Section: admin
Architecture: linux-any Architecture: linux-any
Depends: initscripts, lsb-base, python, ${misc:Depends}, ${shlibs:Depends} Depends: initscripts, lsb-base, python, ${misc:Depends}, ${shlibs:Depends}
@ -50,10 +50,10 @@ Index: pkg-zfs/debian/control.in
Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
Conflicts: zfs, zfs-fuse Conflicts: zfs, zfs-fuse
Replaces: zfs Replaces: zfs
Index: pkg-zfs/debian/rules Index: new/debian/rules
=================================================================== ===================================================================
--- pkg-zfs.orig/debian/rules 2015-07-21 07:14:46.000000000 +0200 --- new.orig/debian/rules 2015-10-09 10:02:40.000000000 +0200
+++ pkg-zfs/debian/rules 2015-07-21 07:50:13.000000000 +0200 +++ new/debian/rules 2015-10-09 10:14:14.000000000 +0200
@@ -25,12 +25,10 @@ @@ -25,12 +25,10 @@
endif endif