tags 613896 patch
thanks
On Fri, Feb 18, 2011 at 10:37:35AM -0500, Douglas A. Tutty wrote:
> I'm following the directions in the docs
>
> # m-a a-i martian-modem
Thanks for your report. From what I can determine, there are two
problems introduced at martian-modem 20080625-1:
* unnecessary quilt inclusion in martian-modem-source
* debhelper not listed as a dependency for martian-modem-source
The patch added in #563508 is applied via quilt during building of
martian-modem-source, but use of quilt is not required when generating a
martian-modem-modules-* package from it with Module-Assistant. See
#532787 for a similar problem I previously identified involving dpatch.
"debhelper (>= 5)" was a Depends for martian-modem-source in
martian-modem 20080617-1, replaced with "${misc:Depends}" at 20080625-1.
As the debhelper dependency is no longer present, it is not installed
when martian-modem-source is, resulting in your second build failure.
Attached is a patch amending both issues.
Geoff
diff -u martian-modem-20080625/debian/control martian-modem-20080625/debian/control
--- martian-modem-20080625/debian/control
+++ martian-modem-20080625/debian/control
@@ -18,7 +18,7 @@
Package: martian-modem-source
Architecture: i386
-Depends: ${misc:Depends}, make, bzip2
+Depends: ${misc:Depends}, debhelper (>= 6), make, bzip2
Recommends: martian-modem, module-assistant
Description: Source for the martian-modem driver
This package provides the source code for the martian-modem kernel module
diff -u martian-modem-20080625/debian/rules martian-modem-20080625/debian/rules
--- martian-modem-20080625/debian/rules
+++ martian-modem-20080625/debian/rules
@@ -143,6 +143,9 @@
# any kind of modification can not made to some files (read Copyright)
dh_install -p$(PKGMODULE) martian.h usr/src/modules/$(sname)
+ # Disable quilt inclusion (#613896)
+ sed -i -e 's:include /usr/share/quilt/quilt.make:#include /usr/share/quilt/quilt.make:' debian/${PKGMODULE}/usr/src/modules/${sname}/debian/rules
+
# Have to set permissions now before tar'ing
chown -R root.src debian/$(psource)/usr/src/modules
cd debian/$(PKGMODULE)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules; cd -
