diff -Nru blktap-dkms-2.0.93/debian/changelog blktap-dkms-2.0.93/debian/changelog --- blktap-dkms-2.0.93/debian/changelog 2015-03-22 12:13:27.000000000 +0000 +++ blktap-dkms-2.0.93/debian/changelog 2015-07-29 05:39:15.000000000 +0000 @@ -1,3 +1,31 @@ +blktap-dkms (2.0.93-0.3ubuntu6~15.04.1) vivid; urgency=medium + + * debian/rules: Stop recommending kernel headers, our DKMS packages + shouldn't do this, as we have no way of matching installed kernel. + + -- Adam Conrad Tue, 28 Jul 2015 23:25:07 -0600 + +blktap-dkms (2.0.93-0.3ubuntu5) wily; urgency=low + + * Added compat code to avoid use of bio->bi_iter for kernels <3.14 + the Debian change that came with 2.0.93-0.3 did not bother about + older kernels (fixup for LP: #1477718). + + -- Stefan Bader Fri, 24 Jul 2015 10:02:37 +0200 + +blktap-dkms (2.0.93-0.3ubuntu4) wily; urgency=medium + + * Substituted linux-any for the list of architectures. + + -- Tim Gardner Thu, 23 Jul 2015 12:36:56 -0600 + +blktap-dkms (2.0.93-0.3ubuntu3) wily; urgency=medium + + * Add patch to support kernels >= 4.1 + debian/patches/Version-dependent-compilation.patch + + -- Tim Gardner Thu, 23 Jul 2015 12:23:06 -0600 + blktap-dkms (2.0.93-0.3ubuntu2) vivid; urgency=medium * Also add powerpc and ppc64el to the Architecture list, for the same diff -Nru blktap-dkms-2.0.93/debian/control blktap-dkms-2.0.93/debian/control --- blktap-dkms-2.0.93/debian/control 2015-03-22 11:48:06.000000000 +0000 +++ blktap-dkms-2.0.93/debian/control 2015-07-23 18:36:39.000000000 +0000 @@ -11,7 +11,7 @@ Homepage: http://www.xen.org/ Package: blktap-dkms -Architecture: i386 amd64 armhf powerpc ppc64el +Architecture: linux-any Depends: ${misc:Depends}, dkms, linux-libc-dev, libc6-dev Recommends: ${xcp-kernel-header-recommends} Description: Xen API blktap kernel component DKMS package diff -Nru blktap-dkms-2.0.93/debian/patches/series blktap-dkms-2.0.93/debian/patches/series --- blktap-dkms-2.0.93/debian/patches/series 2014-08-18 04:09:38.000000000 +0000 +++ blktap-dkms-2.0.93/debian/patches/series 2015-07-23 18:16:43.000000000 +0000 @@ -1,3 +1,4 @@ fixes-DEST_MODULE_LOCATION-in-dkms.conf.patch fix-vm-reserved.patch bi_sector-fix.patch +Version-dependent-compilation.patch diff -Nru blktap-dkms-2.0.93/debian/patches/Version-dependent-compilation.patch blktap-dkms-2.0.93/debian/patches/Version-dependent-compilation.patch --- blktap-dkms-2.0.93/debian/patches/Version-dependent-compilation.patch 1970-01-01 00:00:00.000000000 +0000 +++ blktap-dkms-2.0.93/debian/patches/Version-dependent-compilation.patch 2015-07-24 08:43:49.000000000 +0000 @@ -0,0 +1,48 @@ +Index: blktap-dkms-2.0.93/request.c +=================================================================== +--- blktap-dkms-2.0.93.orig/request.c 2012-09-07 18:13:56.000000000 +0200 ++++ blktap-dkms-2.0.93/request.c 2015-07-24 09:50:31.000000000 +0200 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "blktap.h" + +@@ -199,7 +200,11 @@ blktap_page_pool_resize(struct blktap_pa + /* NB. mempool asserts min_nr >= 1 */ + target = max(1, target); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) ++ err = mempool_resize(bufs, target); ++#else + err = mempool_resize(bufs, target, GFP_KERNEL); ++#endif + if (err) + return err; + +Index: blktap-dkms-2.0.93/ring.c +=================================================================== +--- blktap-dkms-2.0.93.orig/ring.c 2015-07-24 09:50:31.000000000 +0200 ++++ blktap-dkms-2.0.93/ring.c 2015-07-24 10:43:43.655459539 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + /* VM_RESERVED has disappeared starting from Linux 3.7 and has been + * replaced by VM_DONTDUMP since then. +@@ -311,7 +312,11 @@ blktap_ring_make_tr_request(struct blkta + unsigned int nsecs; + + breq->u.tr.nr_sectors = nsecs = bio_sectors(bio); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) ++ breq->u.tr.sector_number = bio->bi_sector; ++#else + breq->u.tr.sector_number = bio->bi_iter.bi_sector; ++#endif + + return nsecs; + } diff -Nru blktap-dkms-2.0.93/debian/rules blktap-dkms-2.0.93/debian/rules --- blktap-dkms-2.0.93/debian/rules 2014-08-18 04:06:59.000000000 +0000 +++ blktap-dkms-2.0.93/debian/rules 2015-07-29 05:24:51.000000000 +0000 @@ -9,7 +9,7 @@ override_dh_gencontrol: if dpkg-vendor --derives-from ubuntu ; then \ - dh_gencontrol -- -T$(CURDIR)/debian/ubuntu_control_vars ; \ + dh_gencontrol ; \ else \ dh_gencontrol -- -T$(CURDIR)/debian/debian_control_vars ; \ fi diff -Nru blktap-dkms-2.0.93/debian/ubuntu_control_vars blktap-dkms-2.0.93/debian/ubuntu_control_vars --- blktap-dkms-2.0.93/debian/ubuntu_control_vars 2014-08-18 04:06:59.000000000 +0000 +++ blktap-dkms-2.0.93/debian/ubuntu_control_vars 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xcp-kernel-header-recommends= linux-headers-generic