# also update version in
# zfs-changelog.Debian and spl-changelog.Debian
ZFSVER=0.6.4
-ZFSPKGREL=3~wheezy
-SPLPKGREL=3~wheezy
+ZFSPKGREL=4~wheezy
+SPLPKGREL=4~wheezy
ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
SPLPKGVER=${ZFSVER}-${SPLPKGREL}
rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
# list tags with: git tag --list 'master/*'
git clone https://github.com/zfsonlinux/pkg-spl.git
- # udate manually to 0.6.4.1 for now
- cd pkg-spl; git checkout upstream
- 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 merge upstream -m "merge upstream"
+ #cd pkg-spl; git fetch --tags
+ cd pkg-spl; git checkout snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy
+ ## udate manually to 0.6.4.1 for now
+ #cd pkg-spl; git checkout upstream
+ #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 merge upstream -m "merge upstream"
git clone https://github.com/zfsonlinux/pkg-zfs.git
- cd pkg-zfs; git checkout master/debian/wheezy/0.6.4-1.1-1-wheezy
+ cd pkg-zfs; git checkout snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy
tar czf ${SPLSRC} pkg-spl
tar czf ${ZFSSRC} pkg-zfs
+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)
+
+ -- Proxmox Support Team <support@proxmox.com> Tue, 21 Jul 2015 07:16:12 +0200
+
spl-linux (0.6.4-3~wheezy) unstable; urgency=low
* update to 0.6.4.1
-Index: new-spl/debian/rules
+Index: pkg-spl/debian/rules
===================================================================
---- new-spl.orig/debian/rules 2015-04-12 14:06:48.000000000 +0200
-+++ new-spl/debian/rules 2015-04-12 16:51:10.000000000 +0200
-@@ -24,15 +24,12 @@
+--- pkg-spl.orig/debian/rules 2015-07-21 07:14:29.000000000 +0200
++++ pkg-spl/debian/rules 2015-07-21 07:28:47.000000000 +0200
+@@ -22,9 +22,7 @@
+ 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 @@
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 @@
- @# 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
-@@ -67,36 +63,6 @@
- @# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
+ sed -e 's/##SHLIB_MAJOR##/$(SHLIB_MAJOR)/g' < debian/control.in > debian/control
+@@ -75,59 +73,6 @@
+ @# 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
- 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)
-Index: new-spl/debian/control.in
+Index: pkg-spl/debian/control.in
===================================================================
---- new-spl.orig/debian/control.in 2015-04-12 14:06:48.000000000 +0200
-+++ new-spl/debian/control.in 2015-04-12 16:11:39.000000000 +0200
-@@ -18,28 +18,6 @@
- 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 2015-07-21 07:14:29.000000000 +0200
++++ pkg-spl/debian/control.in 2015-07-21 07:19:42.000000000 +0200
+@@ -33,28 +33,6 @@
+ 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
+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)
+
+ * use upstream version of /etc/default/zfs
+
+ -- Proxmox Support Team <support@proxmox.com> Tue, 21 Jul 2015 07:17:40 +0200
+
zfs-linux (0.6.4-3~wheezy) unstable; urgency=low
* update to 0.6.4.1
-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 2015-07-21 07:14:46.000000000 +0200
++++ pkg-zfs/debian/control.in 2015-07-21 07:48:21.000000000 +0200
+@@ -102,39 +102,9 @@
+ 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
-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
-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
-
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 @@
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 2015-07-21 07:14:46.000000000 +0200
++++ pkg-zfs/debian/rules 2015-07-21 07:50:13.000000000 +0200
+@@ -25,12 +25,10 @@
endif
ifndef SPL
+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
-
- 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 @@
+@@ -83,42 +81,6 @@
@# Install the utilities.
$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
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 @@
# 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
+++ /dev/null
-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'
fix-control.patch
-fix-etc-default-zfs.patch
projects / zfsonlinux.git / commitdiff