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

updates from upstream

Browse Source 
spl: snapshot/debian/jessie/0.6.4-8-8ac6ff
zfs: snapshot/debian/jessie/0.6.4-24-6bec43
This commit is contained in:
Dietmar Maurer 2015-08-24 06:14:43 +02:00
parent 1c1a906890
commit 20bb0ecfa0
7 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -3,8 +3,8 @@ RELEASE=4.0
# source form https://github.com/zfsonlinux/
ZFSVER=0.6.4
ZFSPKGREL=pve2~jessie
SPLPKGREL=pve2~jessie
ZFSPKGREL=pve3~jessie
SPLPKGREL=pve3~jessie
ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
SPLPKGVER=${ZFSVER}-${SPLPKGREL}
@ -64,8 +64,8 @@ download:
git clone https://github.com/zfsonlinux/pkg-spl.git
git clone https://github.com/zfsonlinux/pkg-zfs.git
# list tags with: git tag --list 'master/*'
cd pkg-spl; git checkout snapshot/debian/jessie/0.6.4-6-37d7cd
cd pkg-zfs; git checkout snapshot/debian/jessie/0.6.4-21-53b1d9
cd pkg-spl; git checkout snapshot/debian/jessie/0.6.4-8-8ac6ff
cd pkg-zfs; git checkout snapshot/debian/jessie/0.6.4-24-6bec43
tar czf ${SPLSRC} pkg-spl
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.4-pve3~jessie) unstable; urgency=medium
* update to snapshot/debian/jessie/0.6.4-8-8ac6ff
-- Proxmox Support Team <support@proxmox.com> Mon, 24 Aug 2015 06:14:12 +0200
spl-linux (0.6.4-pve2~jessie) unstable; urgency=medium
* update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)

16
spl-patches/fix-control.patch
View File

@ -1,8 +1,8 @@
Index: pkg-spl/debian/control.in
Index: new/debian/control.in
===================================================================
--- pkg-spl.orig/debian/control.in
+++ pkg-spl/debian/control.in
@@ -33,32 +33,9 @@ Description: Native ZFS filesystem kerne
--- new.orig/debian/control.in
+++ new/debian/control.in
@@ -35,34 +35,9 @@ Description: Native ZFS filesystem kerne
This package provides the source to the SPL kernel module in a form
suitable for use by module-assistant or kernel-package.
@ -11,6 +11,8 @@ Index: pkg-spl/debian/control.in
-Depends: linux-headers-amd64, ${misc:Depends}, dkms (>> 2.1.1.2-5), lsb-release, file
-Recommends: spl (>= ${source:Upstream-Version})
-Provides: spl-modules
-Conflicts: spl-modules-source
-Replaces: spl-modules-source
-Description: Solaris Porting Layer kernel modules for Linux
- 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
@ -35,10 +37,10 @@ Index: pkg-spl/debian/control.in
Description: Solaris Porting Layer user-space utilities for Linux
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
Index: pkg-spl/debian/rules
Index: new/debian/rules
===================================================================
--- pkg-spl.orig/debian/rules
+++ pkg-spl/debian/rules
--- new.orig/debian/rules
+++ new/debian/rules
@@ -22,9 +22,7 @@ ifndef KVERS
KVERS=$(shell uname -r | sed 's/-$(DEB_HOST_ARCH)//')
endif

6
zfs-changelog.Debian
View File

@ -1,3 +1,9 @@
zfs-linux (0.6.4-pve3~jessie) unstable; urgency=medium
* update to snapshot/debian/jessie/0.6.4-24-6bec43
-- Proxmox Support Team <support@proxmox.com> Mon, 24 Aug 2015 06:13:44 +0200
zfs-linux (0.6.4-pve2~jessie) unstable; urgency=medium
* update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-21-53b1d9)

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
+++ pkg-zfs/debian/control.in
@@ -102,39 +102,9 @@ Description: Native ZFS filesystem kerne
--- new.orig/debian/control.in
+++ new/debian/control.in
@@ -104,39 +104,9 @@ Description: Native ZFS filesystem kerne
This package provides the source to the SPL kernel module in a form
suitable for use by module-assistant or kernel-package.
@ -11,9 +11,9 @@ Index: pkg-zfs/debian/control.in
-Pre-Depends: spl-dkms
-Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}, file
-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
-Conflicts: lzfs, lzfs-dkms
-Conflicts: lzfs, lzfs-dkms, zfs-modules-source
-Description: Native ZFS filesystem kernel modules for Linux
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
@ -42,7 +42,7 @@ Index: pkg-zfs/debian/control.in
zfsutils, ${misc:Depends}
Description: Native ZFS root filesystem capabilities for Linux
The Z file system is a pooled filesystem designed for maximum data
@@ -148,7 +118,6 @@ Package: zfsutils
@@ -150,7 +120,6 @@ Package: zfsutils
Section: admin
Architecture: linux-any
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
Conflicts: zfs, zfs-fuse
Replaces: zfs
Index: pkg-zfs/debian/rules
Index: new/debian/rules
===================================================================
--- pkg-zfs.orig/debian/rules
+++ pkg-zfs/debian/rules
--- new.orig/debian/rules
+++ new/debian/rules
@@ -25,12 +25,10 @@ KARCH=$(shell uname -r | sed "s/.*-\([a-
endif