--- kqemu-1.3.0~pre11.orig/debian/rules +++ kqemu-1.3.0~pre11/debian/rules @@ -0,0 +1,139 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# some default definitions, important! +# +# Name of the source package +psource:=kqemu-source + +# The short upstream name, used for the module source directory +sname:=kqemu + +### KERNEL SETUP +### Setup the stuff needed for making kernel module packages +### taken from /usr/share/kernel-package/sample.module.rules + +# prefix of the target package name +PACKAGE=kqemu-modules +# modifieable for experiments or debugging m-a +MA_DIR ?= /usr/share/modass +# load generic variable handling +-include $(MA_DIR)/include/generic.make +# load default rules, including kdist, kdist_image, ... +-include $(MA_DIR)/include/common-rules.make + +# module assistant calculates all needed things for us and sets +# following variables: +# KSRC (kernel source directory), KVERS (kernel version string), KDREV +# (revision of the Debian kernel-image package), CC (the correct +# compiler), VERSION (the final package version string), PKGNAME (full +# package name with KVERS included), DEB_DESTDIR (path to store DEBs) + +# The kdist_configure target is called by make-kpkg modules_config and +# by kdist* rules by dependency. It should configure the module so it is +# ready for compilation (mostly useful for calling configure). +# prep-deb-files from module-assistant creates the neccessary debian/ files +kdist_configure: prep-deb-files + +# the kdist_clean target is called by make-kpkg modules_clean and from +# kdist* rules. It is responsible for cleaning up any changes that have +# been made by the other kdist_commands (except for the .deb files created) +kdist_clean: clean + $(MAKE) $(MFLAGS) -f debian/rules clean +# +### end KERNEL SETUP + +# the binary-modules rule is invoked by module-assistant while processing the +# kdist* targets. It is called by module-assistant or make-kpkg and *not* +# during a normal build +binary-modules: prep-deb-files + dh_testroot + dh_clean -k + + # Build the module + ./configure --kernel-path=$(KSRC) + $(MAKE) + + # Install the module + install -D -m 0644 kqemu.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/misc/kqemu.ko + + dh_installdocs + dh_installchangelogs Changelog + dh_compress + dh_fixperms + dh_installmodules + dh_installdeb + dh_gencontrol -- -v$(VERSION) + dh_md5sums + dh_builddeb --destdir=$(DEB_DESTDIR) + dh_clean -k + +build: patch-stamp + +clean: unpatch + dh_testdir + #dh_testroot + + # Cleaning package + -$(MAKE) clean + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Create kqemu-common + install -D -m 0644 debian/config/kqemu.modprobe debian/kqemu-common/etc/modprobe.d/kqemu + install -d -m 0755 debian/kqemu-common/usr/share/doc/kqemu-common + install -m 0644 *.html debian/kqemu-common/usr/share/doc/kqemu-common + + # Create the directories to install the source into + dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian + + # Copy only the driver source to the proper location + cp -a Changelog Makefile configure install.sh *.c *.h common debian/$(psource)/usr/src/modules/$(sname) + touch debian/$(psource)/usr/src/modules/$(sname)/config-host.mak + # Copy the needed debian/ pieces to the proper location + cp debian/*modules.in* \ + debian/$(psource)/usr/src/modules/$(sname)/debian + cp debian/control debian/rules debian/changelog debian/copyright \ + debian/compat debian/$(psource)/usr/src/modules/$(sname)/debian/ + cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules + + dh_install + +binary-arch: build install + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs Changelog + dh_installdocs + dh_install + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install binary-modules kdist kdist_configure kdist_image kdist_clean --- kqemu-1.3.0~pre11.orig/debian/config/kqemu.modprobe +++ kqemu-1.3.0~pre11/debian/config/kqemu.modprobe @@ -0,0 +1 @@ +options kqemu major=0 --- kqemu-1.3.0~pre11.orig/debian/copyright +++ kqemu-1.3.0~pre11/debian/copyright @@ -0,0 +1,99 @@ +This package was debianized by Daniel Baumann on +Fri, 17 Nov 2006 08:29:00 +0100. + +It was downloaded from . + +Upstream Author: Fabrice Bellard + +License (everything except kqemu-win32.c, kqemu.h, kqemu.inf): + + Copyright (C) 2004-2007 Fabrice Bellard + + 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 + + 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-2008, Daniel Baumann and +is licensed under the GPL, see /usr/share/common-licenses/GPL-2. --- kqemu-1.3.0~pre11.orig/debian/control.modules.in +++ kqemu-1.3.0~pre11/debian/control.modules.in @@ -0,0 +1,28 @@ +Source: kqemu +Section: misc +Priority: optional +Maintainer: Daniel Baumann +Build-Depends: debhelper (>= 6) +Standards-Version: 3.7.3 +Homepage: http://www.qemu.org/ + +Package: kqemu-modules-_KVERS_ +Architecture: any +Depends: linux-modules-_KVERS_ | linux-image-_KVERS_, kqemu-common +Recommends: qemu (>= 0.8.1) +Provides: kqemu-modules +Description: kqemu modules for Linux (kernel _KVERS_). + This package contains the set of loadable kernel modules for the + QEMU Accelerator module. + . + The QEMU Accelerator Module increases the speed of QEMU when a PC is emulated + on a PC. It runs most of the target application code directly on the host + processor to achieve near native performance. It is very useful when you want + to run another Operating System (for example Windows) on a Linux desktop. + . + This package contains the compiled kernel modules for _KVERS_ + . + If you have compiled your own kernel, you will most likely need to build + your own kqemu-modules. The kqemu-source package has been + provided for use with the Debian's module-assistant or kernel-package + utilities to produce a version of kqemu-modules for your kernel. --- kqemu-1.3.0~pre11.orig/debian/kqemu-source.README.Debian +++ kqemu-1.3.0~pre11/debian/kqemu-source.README.Debian @@ -0,0 +1,17 @@ +kqemu for Debian +---------------- + +The Debian kqemu-source package can be used in several ways, + + - Using module-assistant(8) commands provided by the module-assistant Debian + package: + + # module-assistant prepare kqemu + # module-assistant auto-install kqemu + + - Using the make-kpkg(1) command provided by the kernel-package Debian + package. See the "modules_image" section of the make-kpkg(1) man page. + + - Unpacking /usr/src/kqemu-*.tar.bz2 and installing the module on your own. + + -- Daniel Baumann Fri, 17 Nov 2006 08:29:00 +0100 --- kqemu-1.3.0~pre11.orig/debian/changelog +++ kqemu-1.3.0~pre11/debian/changelog @@ -0,0 +1,161 @@ +kqemu (1.3.0~pre11-8) unstable; urgency=medium + + * Bumping package to policy 3.7.3. + * Bumping package to debhelper 6. + * Using new homepage field in control. + * Correcting wrong man section of module-assistant in README.Debian. + * Temporarily build-depending on gcc-4.1 (Closes: #444008). + * Updated Otavios patch: + - Builds fine with dash as /bin/sh (Closes: #425930). + - Now that the kernel arch matches, it will also build on amd64 + (Closes: #460090). + - Allows building of kqemu with modules-assistant and kernel 2.6.24 again + (Closes: #463782). + + -- Daniel Baumann Mon, 4 Feb 2008 12:58:00 +0100 + +kqemu (1.3.0~pre11-7) unstable; urgency=medium + + * Fixing another issue affecting linux-modules-extra-2.6 (Closes: #433525). + + -- Daniel Baumann Mon, 3 Dec 2007 13:03:00 +0100 + +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 Thu, 06 Sep 2007 11:45:33 +0000 + +kqemu (1.3.0~pre11-6) unstable; urgency=low + + * Applied patch from Samuel Tardieu to fix FTBFS with + linux 2.6.22 (Closes: #434031). + + -- Daniel Baumann Mon, 23 Jul 2007 20:11:00 +0200 + +kqemu (1.3.0~pre11-5) unstable; urgency=medium + + * Reverting major number change in module alias file (Closes: #417254). + + -- Daniel Baumann Tue, 1 May 2007 19:55:00 +0200 + +kqemu (1.3.0~pre11-4) unstable; urgency=low + + * Disabling makefile patch (Closes: #416300, #416347). + * Updated major number in module alias file (Closes: #416307). + + -- Daniel Baumann Tue, 27 Mar 2007 13:13:00 +0100 + +kqemu (1.3.0~pre11-3) unstable; urgency=medium + + * Added patch from Otavio Salvador to fix FTBFS in + Makefile for non-i386 architectures. + + -- Daniel Baumann Sun, 25 Mar 2007 10:28:00 +0100 + +kqemu (1.3.0~pre11-2) unstable; urgency=low + + * Upload to unstable. + * Removed kqemu-common.postinst, the device is now created dynamically even + when no udev is available (Closes: #410294, #410653). + + -- Daniel Baumann Wed, 7 Feb 2007 18:01:00 +0100 + +kqemu (1.3.0~pre11-1) experimental; urgency=low + + * New upstream release. + + -- Daniel Baumann Wed, 7 Feb 2007 18:01:00 +0100 + +kqemu (1.3.0~pre10-2) experimental; urgency=low + + * Forgot to adjust section in control.modules.in. + + -- Daniel Baumann Tue, 6 Feb 2007 10:35:00 +0100 + +kqemu (1.3.0~pre10-1) experimental; urgency=low + + * New upstream release (Closes: #409882): + - relicensed under GNU General Public License, moving the package to main. + + -- Daniel Baumann Tue, 6 Feb 2007 09:18:00 +0100 + +kqemu (1.3.0~pre9-12) unstable; urgency=medium + + * Adjusted depends in control.modules.in (Closes: #408711). + + -- Daniel Baumann Mon, 29 Jan 2007 00:54:00 +0100 + +kqemu (1.3.0~pre9-11) unstable; urgency=medium + + * Only create device if it is not yet there from a previous package + (Closes: #408131). + + -- Daniel Baumann Fri, 26 Jan 2007 17:45:00 +0100 + +kqemu (1.3.0~pre9-10) unstable; urgency=medium + + * Fixed path in chmod call. + + -- Daniel Baumann Sun, 21 Jan 2007 14:17:00 +0100 + +kqemu (1.3.0~pre9-9) unstable; urgency=medium + + * Moved mknod call into postinst. + + -- Daniel Baumann Wed, 17 Jan 2007 12:23:00 +0100 + +kqemu (1.3.0~pre9-8) unstable; urgency=medium + + * Removed dependency on kqemu-modules; the conglomeration packages do not + provide it (which is a bug, actually). + + -- Daniel Baumann Thu, 11 Jan 2007 20:41:00 +0100 + +kqemu (1.3.0~pre9-7) unstable; urgency=medium + + * Moved /dev/kqemu and documentation into seperate package (Closes: #405703). + + -- Daniel Baumann Wed, 10 Jan 2007 18:41:00 +0100 + +kqemu (1.3.0~pre9-6) unstable; urgency=medium + + * Remove device creation and hope the best for #400788. + + -- Daniel Baumann Wed, 3 Jan 2007 23:26:00 +0100 + +kqemu (1.3.0~pre9-5) unstable; urgency=medium + + * Fixed typo in the maintainer scripts (Closes: #405178). + + -- Daniel Baumann Tue, 2 Jan 2007 16:16:00 +0100 + +kqemu (1.3.0~pre9-4) unstable; urgency=medium + + * Updated README.Debian: + - adding a note about module-assistant (Closes: #401278, #402403). + * The qemu maintainer do not care to answer at all on #400788, therefore I'm + including the udev rules here :/ (Closes: #400139). + + -- Daniel Baumann Sun, 31 Dec 2006 16:07:00 +0100 + +kqemu (1.3.0~pre9-3) unstable; urgency=low + + * Added install.sh to kqemu-source (Closes: #401174). + + -- Daniel Baumann Sat, 2 Dec 2006 00:06:00 +0100 + +kqemu (1.3.0~pre9-2) unstable; urgency=low + + * Added dpatch to depends of kqmeu-source (Closes: #399540). + + -- Daniel Baumann Mon, 20 Nov 2006 18:30:00 +0100 + +kqemu (1.3.0~pre9-1) unstable; urgency=low + + * Initial release (Closes: #396097). + + -- Daniel Baumann Fri, 17 Nov 2006 08:29:00 +0100 --- kqemu-1.3.0~pre11.orig/debian/patches/02-makefile.dpatch +++ kqemu-1.3.0~pre11/debian/patches/02-makefile.dpatch @@ -0,0 +1,32 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 02-makefile.dpatch by Otavio Salvador +## +## DP: Fix non-i386 FTBFS. + +@DPATCH@ + +diff -Naurp kqemu-1.3.0~pre11.orig/Makefile kqemu-1.3.0~pre11/Makefile +--- kqemu-1.3.0~pre11.orig/Makefile 2007-02-06 21:02:00.000000000 +0000 ++++ kqemu-1.3.0~pre11/Makefile 2008-02-04 11:53:46.000000000 +0000 +@@ -92,7 +92,7 @@ else + obj-m:= kqemu.o + kqemu-objs:= kqemu-linux.o kqemu-mod.o + +-$(obj)/kqemu-mod.o: $(src)/kqemu-mod-$(ARCH).o +- cp $< $@ ++$(obj)/kqemu-mod.o: ++ $(MAKE) -C $(obj)/common + endif + endif # PATCHLEVEL +diff -Naurp kqemu-1.3.0~pre11.orig/common/Makefile kqemu-1.3.0~pre11/common/Makefile +--- kqemu-1.3.0~pre11.orig/common/Makefile 2007-02-06 21:02:00.000000000 +0000 ++++ kqemu-1.3.0~pre11/common/Makefile 2008-02-04 11:53:28.000000000 +0000 +@@ -35,7 +35,7 @@ TARGET=../kqemu-mod-$(ARCH)-win32.o + CC=i386-mingw32-gcc + LD=i386-mingw32-ld + else +-TARGET=../kqemu-mod-$(ARCH).o ++TARGET=../kqemu-mod.o + CC=gcc + LD=ld + endif --- kqemu-1.3.0~pre11.orig/debian/patches/01-configure.dpatch +++ kqemu-1.3.0~pre11/debian/patches/01-configure.dpatch @@ -0,0 +1,19 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-configure.dpatch by Daniel Baumann +## +## DP: Fix shell quoting. + +@DPATCH@ + +diff -Naur kqemu-1.3.0pre9.orig/configure kqemu-1.3.0pre9/configure +--- kqemu-1.3.0pre9.orig/configure 2006-06-23 20:52:34.000000000 +0000 ++++ kqemu-1.3.0pre9/configure 2006-11-18 09:04:53.000000000 +0000 +@@ -341,7 +341,7 @@ + fi + if test $linux = "yes" ; then + echo "KERNEL_PATH=$kernel_path" >> $config_mak +- if test $kbuild26 = "yes" ; then ++ if test "$kbuild26" = "yes" ; then + echo "CONFIG_KBUILD26=yes" >> $config_mak + fi + fi --- kqemu-1.3.0~pre11.orig/debian/patches/00list +++ kqemu-1.3.0~pre11/debian/patches/00list @@ -0,0 +1,3 @@ +01-configure.dpatch +02-makefile.dpatch +03-2.6.22.dpatch --- kqemu-1.3.0~pre11.orig/debian/patches/03-2.6.22.dpatch +++ kqemu-1.3.0~pre11/debian/patches/03-2.6.22.dpatch @@ -0,0 +1,18 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 03-2.5.22.dpatch by Samuel Tardieu +## +## DP: Fix FTBFS with linux 2.6.22 (Closes: #434031). + +@DPATCH@ + +diff -Naur kqemu-1.3.0pre11.orig/kqemu-linux.c kqemu-1.3.0pre11/kqemu-linux.c +--- kqemu-1.3.0pre11.orig/kqemu-linux.c 2007-02-06 21:02:00.000000000 +0000 ++++ kqemu-1.3.0pre11/kqemu-linux.c 2007-07-24 05:41:14.000000000 +0000 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include --- kqemu-1.3.0~pre11.orig/debian/compat +++ kqemu-1.3.0~pre11/debian/compat @@ -0,0 +1 @@ +6 --- kqemu-1.3.0~pre11.orig/debian/control +++ kqemu-1.3.0~pre11/debian/control @@ -0,0 +1,30 @@ +Source: kqemu +Section: misc +Priority: optional +Maintainer: Daniel Baumann +Build-Depends: debhelper (>= 6), dpatch, bzip2 +Standards-Version: 3.7.3 +Homepage: http://www.qemu.org/ + +Package: kqemu-common +Architecture: all +Description: Common files for the QEMU Accelerator module + The QEMU Accelerator Module increases the speed of QEMU when a PC is emulated + on a PC. It runs most of the target application code directly on the host + processor to achieve near native performance. It is very useful when you want + to run another Operating System (for example Windows) on a Linux desktop. + . + This package contains the common files. + +Package: kqemu-source +Architecture: all +Depends: debhelper (>= 6), dpatch, module-assistant, bzip2, make, gcc-4.1 +Description: Source for the QEMU Accelerator module + This package provides the source code for the kqemu kernel modules. + The qemu package is also required in order to make use of these + modules. Kernel source or headers are required to compile these modules. + . + The QEMU Accelerator Module increases the speed of QEMU when a PC is emulated + on a PC. It runs most of the target application code directly on the host + processor to achieve near native performance. It is very useful when you want + to run another Operating System (for example Windows) on a Linux desktop.