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

update to 0.6.4.2

Browse Source
This commit is contained in:
Dietmar Maurer
2015-07-21 07:17:04 +02:00
parent 0ca48f6b95
commit 69aebd7324
9 changed files with 125 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spl-patches/fix-control
+52 -37
View File
@@ -1,44 +1,39 @@
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
@@ -62,18 +57,38 @@ Index: new-spl/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)
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