Merge lp:~vanvugt/ubuntu/natty/oss4/fix-746048 into lp:ubuntu/natty/oss4

[Daniel van Vugt]

Fixed build failure on kernels >= 2.6.36 (LP: #746048)

[Marc Deslauriers (mdeslaur)]

Thanks for the fix, however could you please do the following:
1- Add an appropriate changelog entry to debian/changelog that details the fix and references the bug number
2- Add tagging to the patch to locate it's origin (see http://dep.debian.net/deps/dep3/)
3- Add the other part of the upstream fix:

     1.6 /* readdir_t tmp_readdir = (readdir_t)op->readdir; */
     1.7 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35)
     1.8 ioctl_t tmp_ioctl = (ioctl_t) op->ioctl;
     1.9 +#endif

Thanks!

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Changes made as requested by Marc.

Though, is it necessary to always include debian/changelog in a merge proposal? I stopped doing so a while ago because I noticed other people didn't bother and the required info is already on the merge proposal page. Or is a debian/changelog only needed in cases like this where it's likely the be the only merge proposal going into the package revision?

[Stefano Rivera (stefanor)]

Daniel: Now that this is fixed in Oneiric, we can see about doing this SRU.
See the SRU documentation: https://wiki.ubuntu.com/StableReleaseUpdates

The proposal looks good, but needs a couple of tweaks:
* natty -> natty-proposed
* Please use the version number 4.2-build2003-1ubuntu1.1 (it indicates an SRU)
* Please provide test-case instructions in the bug report. (Should be pretty simple: install oss4-base + oss4-dkms, look for success / failure)

review: Needs Fixing

[Stefano Rivera (stefanor)]

Whoops, I the version should have actually been 4_4.2-build2003-1ubuntu1.11.04.1, as 4_4.2-build2003-1ubuntu1 is published in both maverick and natty.

Anyway, I fixed that on upload.

I've uploaded this to natty-proposed, and it's pending SRU team review.

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-31 19:37:43 +0000
+++ debian/changelog	2011-06-17 07:21:24 +0000
@@ -1,3 +1,10 @@
+oss4 (4.2-build2003-1ubuntu1.1) natty-proposed; urgency=low
+
+  * Fixed DKMS build failure on kernels >= 2.6.36, ie. oss4-dkms never
+    successfully installed on natty until now (LP: #746048)
+
+ -- Daniel van Vugt <[e-mail]>  Wed, 15 Jun 2011 14:00:38 +0800
+
 oss4 (4.2-build2003-1ubuntu1) maverick; urgency=low
 
   * Merge from debian unstable (LP: #606833). Remaining changes:

=== added file 'debian/patches/missing_fop_ioctl_2.6.36.patch'
--- debian/patches/missing_fop_ioctl_2.6.36.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/missing_fop_ioctl_2.6.36.patch	2011-06-17 07:21:24 +0000
@@ -0,0 +1,31 @@
+From: Daniel van Vugt <[e-mail]>
+Description: Fixed build failure on kernels >= 2.6.36 (LP: #746048)
+Bug-Ubuntu: https://launchpad.net/bugs/746048
+Bug-Debian: http://bugs.debian.org/595298
+Origin: upstream, http://opensound.hg.sourceforge.net/hgweb/opensound/opensound/rev/c63e54ba4988
+Forwarded: not-needed
+Author: Yair K (at Origin)
+
+--- a/setup/Linux/oss/build/osscore.c	Mon Aug 09 04:43:06 2010 +0300
++++ b/setup/Linux/oss/build/osscore.c	Sat Sep 25 18:02:53 2010 +0300
+@@ -933,7 +933,9 @@
+   read_t tmp_read = (read_t) op->read;
+   write_t tmp_write = (write_t) op->write;
+   /* readdir_t tmp_readdir = (readdir_t)op->readdir; */
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35)
+   ioctl_t tmp_ioctl = (ioctl_t) op->ioctl;
++#endif
+   mmap_t tmp_mmap = (mmap_t) op->mmap;
+   open_t tmp_open = (open_t) op->open;
+   release_t tmp_release = (release_t) op->release;
+@@ -953,7 +955,9 @@
+   fop->write = tmp_write;
+   fop->readdir = NULL;		/* tmp_readdir; */
+   fop->poll = tmp_poll;
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35)
+   fop->ioctl = tmp_ioctl;
++#endif
+   fop->mmap = tmp_mmap;
+   fop->open = tmp_open;
+   fop->release = tmp_release;
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-12-07 14:52:21 +0000
+++ debian/patches/series	2011-06-17 07:21:24 +0000
@@ -4,4 +4,4 @@
 arch_without_mregparm.patch
 dont_build_kernel_module.patch
 fix_invalid_printf.patch
-
+missing_fop_ioctl_2.6.36.patch