Bug#433527: new kqemu patch
Here's a new patch to add kqemu modules. Some notes:
- It needs kqemu-source >= 1.3.0~pre11-6.1 (currently in incoming).
- It passes ARCH=$(KERNEL_ARCH) as a make variable override to prevent
ARCH=amd64 from confusing the linux/kqemu build system which expects
x86_64 (I would suggest renaming ARCH to DEBIAN_ARCH to solve this
problem globally).
- It does only enable amd64 builds. i386 ones mostly work, but they
attempt to build a biarch amd64 flavour which is not supported in kqemu.
I didn't find a way to specify in kqemu/defines that the intersection of
i386 arch and amd64 flavour has to be disabled (without disabling amd64,
that is), so I left i386 disabled for now.
--
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 -x debian linux-modules-extra-2.6-2.6.21.old/defines linux-modules-extra-2.6-2.6.21/defines
--- linux-modules-extra-2.6-2.6.21.old/defines 2007-07-04 18:22:43.000000000 +0000
+++ linux-modules-extra-2.6-2.6.21/defines 2007-09-06 19:01:16.000000000 +0000
@@ -1,5 +1,6 @@
[base]
modules:
gspca
+ kqemu
squashfs
unionfs
diff -Nur -x debian linux-modules-extra-2.6-2.6.21.old/kqemu/copyright linux-modules-extra-2.6-2.6.21/kqemu/copyright
--- linux-modules-extra-2.6-2.6.21.old/kqemu/copyright 1970-01-01 00:00:00.000000000 +0000
+++ linux-modules-extra-2.6-2.6.21/kqemu/copyright 2007-09-06 11:33:10.000000000 +0000
@@ -0,0 +1,99 @@
+This package was debianized by Daniel Baumann <daniel@debian.org> on
+Fri, 17 Nov 2006 08:29:00 +0100.
+
+It was downloaded from <http://www.qemu.org/>.
+
+Upstream Author: Fabrice Bellard <fabrice@bellard.org>
+
+License (everything except kqemu-win32.c, kqemu.h, kqemu.inf):
+
+ Copyright (C) 2004-2007 Fabrice Bellard <fabrice@bellard.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL file.
+
+License (kqemu-win32.c):
+
+ Copyright (C) 2005 Filip Navara
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License (kqemu.h):
+
+ Copyright (C) 2004-2005 Fabrice Bellard <fabrice@bellard.org>
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License (kqemu.inf):
+
+ Copyright (C) 2005 Filip Navara
+ Copyright (C) 2005 Damien Mascord
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is (C) 2006-2007, Daniel Baumann <daniel@debian.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff -Nur -x debian linux-modules-extra-2.6-2.6.21.old/kqemu/defines linux-modules-extra-2.6-2.6.21/kqemu/defines
--- linux-modules-extra-2.6-2.6.21.old/kqemu/defines 1970-01-01 00:00:00.000000000 +0000
+++ linux-modules-extra-2.6-2.6.21/kqemu/defines 2007-09-06 19:00:29.000000000 +0000
@@ -0,0 +1,6 @@
+[base]
+arches:
+ amd64
+not-subarches: xen xen-vserver
+desc: QEMU Accelerator
+
diff -Nur -x debian linux-modules-extra-2.6-2.6.21.old/kqemu/rules linux-modules-extra-2.6-2.6.21/kqemu/rules
--- linux-modules-extra-2.6-2.6.21.old/kqemu/rules 1970-01-01 00:00:00.000000000 +0000
+++ linux-modules-extra-2.6-2.6.21/kqemu/rules 2007-09-06 12:07:47.000000000 +0000
@@ -0,0 +1,8 @@
+
+$(BUILD_STAMP):
+ cd $(CURDIR)/$(DIR) && ./configure
+ $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) $(JOBS_ARG) ARCH=$(KERNEL_ARCH)
+ touch $@
+
+install:
+ $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE) ARCH=$(KERNEL_ARCH)
Reply to: