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

update to update to 0.6.4.2

Browse Source
This commit is contained in:
Dietmar Maurer 2015-07-21 11:16:26 +02:00
parent 46e32ac3b7
commit 787716f74d
9 changed files with 126 additions and 106 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=pve1~jessie
SPLPKGREL=pve1~jessie
ZFSPKGREL=pve2~jessie
SPLPKGREL=pve2~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 master/debian/jessie/0.6.4-1
cd pkg-zfs; git checkout master/debian/jessie/0.6.4-1-2
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
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-pve2~jessie) unstable; urgency=medium
* update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)
-- Proxmox Support Team <support@proxmox.com> Tue, 21 Jul 2015 11:02:31 +0200
spl-linux (0.6.4-pve1~jessie) unstable; urgency=medium
* update to 0.6.4 (use upstream zol package definitions)

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

@ -1,10 +1,10 @@
Index: new/debian/control.in
Index: pkg-spl/debian/control.in
===================================================================
--- new.orig/debian/control.in
+++ new/debian/control.in
@@ -18,32 +18,9 @@ Homepage: http://www.zfsonlinux.org/
Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/spl.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
--- pkg-spl.orig/debian/control.in
+++ pkg-spl/debian/control.in
@@ -33,32 +33,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.
-Package: spl-dkms
-Architecture: all
@ -35,51 +35,47 @@ Index: new/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: new/debian/rules
Index: pkg-spl/debian/rules
===================================================================
--- new.orig/debian/rules
+++ new/debian/rules
@@ -24,15 +24,12 @@ pmodules = $(PACKAGE)-modules-$(non_epoc
--- pkg-spl.orig/debian/rules
+++ pkg-spl/debian/rules
@@ -22,9 +22,7 @@ ifndef KVERS
KVERS=$(shell uname -r | sed 's/-$(DEB_HOST_ARCH)//')
endif
-CFG_OPTS=--without-selinux \
- --with-linux=$(KSRC) \
- --with-linux-obj=$(KOBJ)
+CFG_OPTS=--without-selinux
non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
PACKAGE=spl
@@ -33,7 +31,7 @@ pmodules = $(PACKAGE)-modules-$(non_epoc
KIMGVER=$(shell dpkg -s linux-image-$(KVERS)-$(DEB_HOST_ARCH) | grep ^Version | sed 's/.*: //')
%:
- dh $@ --with dkms
+ dh $@
- dh $@ --with dkms --parallel
+ dh $@ --parallel
override_dh_prep-base-deb-files:
- sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g ; s/##MODULES_BUILD_DEPENDS##/linux-headers-$(KVERS)-common, linux-headers-$(KVERS)-$(DEB_HOST_ARCH)/g' \
+ sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g ; s/##MODULES_BUILD_DEPENDS##/pve-headers-$(KVERS)/g' \
< debian/control.in > debian/control
- sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/_IMGVER_/$(KIMGVER)/g' \
- < debian/control.modules.in >> debian/control
-
for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
< $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
@@ -52,8 +49,7 @@ override_dh_auto_configure: override_dh_
@# Build the userland and the modules
dh_auto_configure -- \
--prefix=/usr \
- --with-linux=$(KSRC) \
- --with-linux-obj=$(KOBJ)
+ --with-config=user
override_dh_auto_test:
# scripts/check.sh tries insmod and rmmod, so it cannot
@@ -63,40 +59,6 @@ override_dh_auto_install:
sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g' < debian/control.in > debian/control
@@ -70,64 +68,6 @@ override_dh_auto_install:
@# Install the utilities.
$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
- @# Get a bare copy of the source code.
- @# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
- @# Get a bare copy of the source code for DKMS.
- @# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree, which does not
- @# contain the userland sources. NB: Remove-userland-dist-rules.patch
- $(MAKE) distdir
-
- # Install the DKMS source.
- @# Install the DKMS source.
- @# We only want the files needed to build the modules
- mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
- touch '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/.nogitrelease'
- rm -Rf '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/include'
- cp '$(CURDIR)/autogen.sh' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/'
- ( for d in include module config; do \
- rm -Rf $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/$$d; \
- done)
- $(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
- @# Hellish awk line:
- @# * Deletes from configure.ac the parts not needed for building the kernel module
@ -103,7 +99,27 @@ Index: new/debian/rules
- echo 'cp "$$@"' >>'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
- chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
-
- find '$(CURDIR)/debian/tmp' -name '*~' | xargs rm
- @# Duplicate the dkms directory for module-assistant source package
- install -d $(CURDIR)/debian/tmp/usr/src/modules
- cp -r $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION) $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)
- mkdir -p $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian
- cp debian/copyright debian/module/* \
- $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/
- sed 's/^spl-linux /spl-modules /' debian/changelog \
- > $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/changelog
- chmod 755 $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/rules
- chown -R root.src $(CURDIR)/debian/tmp
- find $(CURDIR)/debian/tmp/usr/src -type d | xargs chmod 755
- find $(CURDIR)/debian/tmp/usr/src -type f -perm -100 | xargs chmod 755
- find $(CURDIR)/debian/tmp/usr/src -type f -not -perm -100 | xargs chmod 644
- chmod 775 $(CURDIR)/debian/tmp/usr/src/modules
- cd $(CURDIR)/debian/tmp/usr/src && tar cf $(PACKAGE).tar modules
- rm -Rf $(CURDIR)/debian/tmp/usr/src/modules
- bzip2 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar
- chmod 644 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2
- install -d $(CURDIR)/debian/spl-modules-source/usr/src
- mv $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2 $(CURDIR)/debian/spl-modules-source/usr/src/
- rm -Rf $(CURDIR)/debian/spl-modules-source/usr/src/$(NAME)-$(VERSION)
-
override_dh_dkms:
dh_dkms -V $(VERSION)

6
zfs-changelog.Debian
View File

@ -1,3 +1,9 @@
zfs-linux (0.6.4-pve2~jessie) unstable; urgency=medium
* update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-21-53b1d9)
-- Proxmox Support Team <support@proxmox.com> Tue, 21 Jul 2015 11:03:21 +0200
zfs-linux (0.6.4-pve1~jessie) unstable; urgency=medium
* update to 0.6.4 (use upstream zol package definitions)

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

@ -1,10 +1,10 @@
Index: new-zfs/debian/control.in
Index: pkg-zfs/debian/control.in
===================================================================
--- new-zfs.orig/debian/control.in 2015-04-12 14:06:48.000000000 +0200
+++ new-zfs/debian/control.in 2015-04-12 17:24:36.000000000 +0200
@@ -88,36 +88,9 @@
.
This zpool library provides support for managing zpools.
--- pkg-zfs.orig/debian/control.in
+++ pkg-zfs/debian/control.in
@@ -102,39 +102,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.
-Package: zfs-dkms
-Architecture: all
@ -12,7 +12,7 @@ Index: new-zfs/debian/control.in
-Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}, file
-Recommends: zfsutils
-Replaces: lzfs, lzfs-dkms
-Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules
-Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules, zfs-modules-source
-Conflicts: lzfs, lzfs-dkms
-Description: Native ZFS filesystem kernel modules for Linux
- The Z file system is a pooled filesystem designed for maximum data
@ -24,7 +24,9 @@ Index: new-zfs/debian/control.in
-Package: zfs-dracut
-Section: utils
-Architecture: linux-any
-Depends: dracut, zfs-modules | zfs-dkms, zfsutils, ${misc:Depends}
-Depends: dracut,
- zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version}),
- zfsutils, ${misc:Depends}
-Description: Native ZFS root filesystem capabilities for Linux
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
@ -35,24 +37,24 @@ Index: new-zfs/debian/control.in
-
Package: zfs-initramfs
Architecture: linux-any
-Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils, ${misc:Depends}
+Depends: initramfs-tools, zfsutils, ${misc:Depends}
Depends: initramfs-tools, busybox,
- zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version}),
zfsutils, ${misc:Depends}
Description: Native ZFS root filesystem capabilities for Linux
The Z file system is a pooled filesystem designed for maximum data
integrity, supporting data snapshots, multiple copies, and data
@@ -130,7 +103,6 @@
@@ -148,7 +118,6 @@ Package: zfsutils
Section: admin
Architecture: linux-any
Depends: initscripts, lsb-base, python, ${misc:Depends}, ${shlibs:Depends}
-Recommends: zfs-modules | zfs-dkms
-Recommends: zfs-modules | zfs-dkms | zfs-modules-source (>= ${source:Version})
Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
Conflicts: zfs, zfs-fuse
Replaces: zfs
Index: new-zfs/debian/rules
Index: pkg-zfs/debian/rules
===================================================================
--- new-zfs.orig/debian/rules 2015-04-12 14:06:48.000000000 +0200
+++ new-zfs/debian/rules 2015-04-12 17:18:04.000000000 +0200
@@ -24,13 +24,11 @@
--- pkg-zfs.orig/debian/rules
+++ pkg-zfs/debian/rules
@@ -25,12 +25,10 @@ KARCH=$(shell uname -r | sed "s/.*-\([a-
endif
ifndef SPL
@ -60,32 +62,23 @@ Index: new-zfs/debian/rules
+SPLSRC=../pkg-spl
endif
CFG_OPTS=--without-selinux \
- --with-linux=$(KSRC) \
-CFG_OPTS=--with-linux=$(KSRC) \
- --with-linux-obj=$(KOBJ) \
- --with-spl=$(SPLSRC)
+ --with-config=user
+CFG_OPTS=--with-spl=$(SPLSRC)
non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
PACKAGE=zfs
@@ -44,15 +42,9 @@
dh $@ --with dkms --parallel
@@ -41,7 +39,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardeni
KIMGVER=$(shell dpkg -s linux-image-$(KVERS)-$(KARCH) | grep ^Version | sed 's/.*: //')
%:
- dh $@ --with dkms --parallel
+ dh $@ --parallel
override_dh_prep-base-deb-files:
- sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g ; s/##MODULES_BUILD_DEPENDS##/linux-headers-$(KVERS)-common, linux-headers-$(KVERS)-$(DEB_HOST_ARCH), spl-dkms/g' \
+ sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g ; s/##MODULES_BUILD_DEPENDS##/pve-headers-$(KVERS)/g' \
< debian/control.in > debian/control
- sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g' \
- < debian/control.udeb.in >> debian/control
-
- sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/_IMGVER_/$(KIMGVER)/g' \
- < debian/control.modules.in >> debian/control
-
for templ in $(wildcard $(CURDIR)/debian/*_SHLIB_MAJOR_*.in); do \
cat $$templ > `echo $$templ | sed -e 's/_SHLIB_MAJOR_/$(SHLIB_MAJOR)/g ; s/\.in$$//'`; \
done
@@ -89,42 +81,6 @@
sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g' < debian/control.in > debian/control
@@ -83,42 +81,6 @@ override_dh_auto_install:
@# Install the utilities.
$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
@ -128,12 +121,32 @@ Index: new-zfs/debian/rules
mkdir -p $(CURDIR)/debian/tmp/usr/lib
for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
@@ -138,7 +94,7 @@
mv $(CURDIR)/debian/tmp/usr/lib/systemd/system/* $(CURDIR)/debian/tmp/lib/systemd/system/
rmdir $(CURDIR)/debian/tmp/usr/lib/systemd/system
- find '$(CURDIR)/debian/tmp' -name '*~' | xargs rm
+ #find '$(CURDIR)/debian/tmp' -name '*~' | xargs rm
@@ -137,28 +99,6 @@ override_dh_auto_install:
# Fix the includes according to https://github.com/zfsonlinux/zfs/issues/2903
./debian/fix_includes-libspl.sh
- @# Duplicate the dkms directory for module-assistant source package
- install -d $(CURDIR)/debian/tmp/usr/src/modules
- cp -r $(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION) $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)
- mkdir -p $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian
- cp debian/copyright debian/module/* \
- $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/
- sed 's/^zfs-linux /zfs-modules /' debian/changelog \
- > $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/changelog
- chmod 755 $(CURDIR)/debian/tmp/usr/src/modules/$(PACKAGE)/debian/rules
- chown -R root.src $(CURDIR)/debian/tmp
- find $(CURDIR)/debian/tmp/usr/src -type d | xargs chmod 755
- find $(CURDIR)/debian/tmp/usr/src -type f -perm -100 | xargs chmod 755
- find $(CURDIR)/debian/tmp/usr/src -type f -not -perm -100 | xargs chmod 644
- chmod 775 $(CURDIR)/debian/tmp/usr/src/modules
- cd $(CURDIR)/debian/tmp/usr/src && tar cf $(PACKAGE).tar modules
- rm -Rf $(CURDIR)/debian/tmp/usr/src/modules
- bzip2 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar
- chmod 644 $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2
- install -d $(CURDIR)/debian/zfs-modules-source/usr/src
- mv $(CURDIR)/debian/tmp/usr/src/$(PACKAGE).tar.bz2 $(CURDIR)/debian/zfs-modules-source/usr/src/
- rm -Rf $(CURDIR)/debian/zfs-modules-source/usr/src/$(NAME)-$(VERSION)
-
override_dh_installinit:
@# Install systemd files
dh_systemd_enable -pzfsutils etc/systemd/system/zfs.target

20
zfs-patches/fix-etc-default-zfs.patch
View File

@ -1,20 +0,0 @@
Index: new-zfs/debian/zfsutils.zfs.default
===================================================================
--- new-zfs.orig/debian/zfsutils.zfs.default 2015-04-12 14:06:48.000000000 +0200
+++ new-zfs/debian/zfsutils.zfs.default 2015-04-14 07:59:27.000000000 +0200
@@ -36,15 +36,6 @@
# Include '-o' for each option wanted.
MOUNT_EXTRA_OPTIONS=""
-# Build kernel modules with the --enable-debug switch?
-ZFS_DKMS_ENABLE_DEBUG='no'
-
-# Build kernel modules with the --enable-debug-dmu-tx switch?
-ZFS_DKMS_ENABLE_DEBUG_DMU_TX='no'
-
-# Keep debugging symbols in kernel modules?
-ZFS_DKMS_DISABLE_STRIP='no'
-
# Wait for this many seconds in the initrd pre_mountroot?
# This delays startup and should be '0' on most systems.
ZFS_INITRD_PRE_MOUNTROOT_SLEEP='0'

1
zfs-patches/series
View File

@ -1,2 +1 @@
fix-control.patch
fix-etc-default-zfs.patch