On Wed, Sep 05, 2007 at 11:38:02PM +0200, Daniel Baumann wrote:
> Daniel Baumann wrote:
> > i'm uploading unionfs2 in about an hour, then fixed kqemu, and then new
> > linux-modules-extra with both enabled again.
>
> unionfs took longer than expected, still not good, and i'm falling
> asleep now.. if you have time before tomorrow evening, please just NMU.
Done, only for kqemu (as for linux-modules-extra I'll send a followup). Some
notes:
- Both builds were tested and are working. The linux-modules-extra one
required use of the 2.6.21 version of the package for the test, since
with 2.6.22 it's not currently in a buildable state (but this is not
kqemu's fault AFAICT).
- The build failure you alluded to was i386-specific (that's why I didn't
notice). It was caused by the second part of my patch
(the s/ARCH/KERNEL_ARCH/g), which after more careful examination turned
out to be WRONG. The actual magic to avoid this problem is needed in
linux-modules-extra (for which I'll send a patch later).
NMU diff attached.
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call, if you are unable to speak?
(as seen on /.)
diff -Nur kqemu-1.3.0~pre11.old/debian/changelog kqemu-1.3.0~pre11/debian/changelog
--- kqemu-1.3.0~pre11.old/debian/changelog 2007-09-06 10:55:09.000000000 +0000
+++ kqemu-1.3.0~pre11/debian/changelog 2007-09-06 12:10:03.000000000 +0000
@@ -1,3 +1,12 @@
+kqemu (1.3.0~pre11-6.1) unstable; urgency=low
+
+ * NMU (with maintainer's permission).
+ * Fix build issues affecting linux-modules-extra-2.6. (Closes: #433525)
+ - 04-nonfree-object.dpatch: New. Fix dependency on obsolete non-free
+ object.
+
+ -- Robert Millan <[EMAIL PROTECTED]> Thu, 06 Sep 2007 11:45:33 +0000
+
kqemu (1.3.0~pre11-6) unstable; urgency=low
* Applied patch from Samuel Tardieu <[EMAIL PROTECTED]> to fix FTBFS with
diff -Nur kqemu-1.3.0~pre11.old/debian/patches/00list kqemu-1.3.0~pre11/debian/patches/00list
--- kqemu-1.3.0~pre11.old/debian/patches/00list 2007-09-06 10:55:09.000000000 +0000
+++ kqemu-1.3.0~pre11/debian/patches/00list 2007-09-06 12:09:07.000000000 +0000
@@ -1,2 +1,3 @@
01-configure.dpatch
03-2.6.22.dpatch
+04-nonfree-object.dpatch
diff -Nur kqemu-1.3.0~pre11.old/debian/patches/04-nonfree-object.dpatch kqemu-1.3.0~pre11/debian/patches/04-nonfree-object.dpatch
--- kqemu-1.3.0~pre11.old/debian/patches/04-nonfree-object.dpatch 1970-01-01 00:00:00.000000000 +0000
+++ kqemu-1.3.0~pre11/debian/patches/04-nonfree-object.dpatch 2007-09-06 12:00:35.000000000 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## Robert Millan <[EMAIL PROTECTED]>
+##
+## DP: Fix dependency on obsolete non-free object (Closes: #433525).
+
[EMAIL PROTECTED]@
+
+diff -ur kqemu-1.3.0~pre11.old/Makefile kqemu-1.3.0~pre11/Makefile
+--- kqemu-1.3.0~pre11.old/Makefile 2007-07-17 19:37:57.000000000 +0200
++++ kqemu-1.3.0~pre11/Makefile 2007-07-17 19:36:52.000000000 +0200
+@@ -90,9 +90,9 @@
+ # called from 2.6 kernel kbuild
+
+ obj-m:= kqemu.o
+-kqemu-objs:= kqemu-linux.o kqemu-mod.o
++kqemu-objs:= kqemu-linux.o kqemu-mod-$(ARCH).o
+
+-$(obj)/kqemu-mod.o: $(src)/kqemu-mod-$(ARCH).o
+- cp $< $@
++$(obj)/kqemu-mod-$(ARCH).o:
++ $(MAKE) -C $(obj)/common
+ endif
+ endif # PATCHLEVEL
