--- kvm-53+dfsg.orig/scripts/qemu-ifup +++ kvm-53+dfsg/scripts/qemu-ifup @@ -1,5 +1,6 @@ #!/bin/sh -switch=$(/sbin/ip route list | awk '/^default / { print $NF }') +switch=$(ip route ls | awk '/^default / { for(i=0;i insert n+1 empty lines +.\" for manpage-specific macros, see man(7) + +.SH NAME +kvm \- x86 emulator with CPU VT support + +.SH SYNOPSIS +.B kvm +.RI [ options ] [ disk_image ] +.SH OPTIONS +.TP +.B \-h +Print a summary of all options. +.TP +.B -no-kvm +Disable KVM hardware virtualization. +.TP +All other options +The other options are similar to those of qemu(1). + +.SH DESCRIPTION +.B kvm +is based on qemu and its parameters are the same with the above +additions, please see the qemu(1) manpage for instructions on how to +run the program. + +.SH SETTING UP THE NETWORK +In Debian, kvm uses the configuration script +.I /etc/kvm/kvm-ifup +to initialize the network for the virtual machine on the host side +when starting a virtual machine. The default script sets up a virtual +switch, so the guest appears to be on the same subnet as the host, +which greatly simplifies setting up networking in the guest operating +system. For example, if the IP adress of the host is 192.168.1.1, the +guest could use 192.168.1.2, with a netmask of 255.255.255.0. + +To learn more about setting up the network, please refer to the +following documents: +.TP +.BR "QEMU Documentation" " at" +.I http://qemu.org/user-doc.html +.TP +.BR "Linux Networking-concepts" " at" +.I http://www.netfilter.org/documentation/HOWTO/networking-concepts-HOWTO.html +.TP +.BR "Linux Networking HOWTO" " at" +.I http://tldp.org/HOWTO/NET3-4-HOWTO.html +.TP +.BR "Linux Advanced Routing & Traffic Control HOWTO" " at" +.I http://tldp.org/HOWTO/Adv-Routing-HOWTO/index.html + +.SH FILES +.na +.nf +.BR "/etc/kvm/kvm-ifup" ", called at startup to configure the host-side network" +.BR "/usr/share/kvm/" ", BIOS files are by default loaded from this directory" +.BR "/usr/share/kvm/keymaps" ", keymap files" + +.SH SEE ALSO +.BR "kvm-qemu" "(1), " "qemu-img" "(1)." +.SH AUTHOR +KVM was written by Avi Kivity from Qumranet. +.PP +This manual page was written by Baruch Even and +Leonard Norrgard for the Debian project (but may +be used by others). --- kvm-53+dfsg.orig/debian/watch +++ kvm-53+dfsg/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=dversionmangle=s/\+dfsg.*$// \ + http://qa.debian.org/watch/sf.php/kvm/ kvm-(\d*).tar.gz --- kvm-53+dfsg.orig/debian/postrm.modules.in +++ kvm-53+dfsg/debian/postrm.modules.in @@ -0,0 +1,31 @@ +#!/bin/sh + +set -e + +drivers="kvm kvm-intel kvm-amd" +dir=/lib/modules/@KERNEL@/kernel/drivers/kvm + +case "${1}" in + remove) + for driver in $drivers; do + if [ -e "$dir/$driver.ko.linux" ]; then + dpkg-divert --package kvm-modules-@KERNEL@ --remove --rename \ + --divert $dir/$driver.ko.linux \ + $dir/$driver.ko + fi + done + ;; + + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- kvm-53+dfsg.orig/debian/kvm.dirs +++ kvm-53+dfsg/debian/kvm.dirs @@ -0,0 +1,7 @@ +usr/bin +usr/share/bug +usr/share/kvm +etc/udev +etc/kvm/utils +etc/init.d +usr/share/modass/packages --- kvm-53+dfsg.orig/debian/kvm.udev +++ kvm-53+dfsg/debian/kvm.udev @@ -0,0 +1 @@ +KERNEL=="kvm", NAME="%k", GROUP="kvm", MODE="0660" --- kvm-53+dfsg.orig/debian/changelog +++ kvm-53+dfsg/debian/changelog @@ -0,0 +1,305 @@ +kvm (1:53+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream release + * Properly clean out all the blobs from the tarball in get-orig-source. + * Depend on bochsbios-qemu and vgabios to get the needed blobs from there + instead. + + -- Soren Hansen Mon, 26 Nov 2007 12:09:12 +0100 + +kvm (1:52+dfsg-0ubuntu1) hardy; urgency=low + + * New upstream release. + * 08_default_tdf.patch + - Make -tdf the default and add a -no-tdf option. + + -- Soren Hansen Thu, 15 Nov 2007 02:21:55 +0100 + +kvm (1:48+dfsg-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #161790, LP: #149785). + * Remaining Ubuntu changes: + + Add epoch + + debian/preinst: + - Remove code to delete never-in-Ubuntu conf file + + debian/control: + - Demote kvm-source to Suggests + - Mention kvm-source is unnecessary + - Add epoch to Conflicts + + debian/patches/from-debian-qemu/63_use_dev_bus_usb_not_proc_bus_usb.patch + - USB path /proc/bus/usb => /dev/bus/usb + + debian/rules: + - Call dh_installudev + * New changes: + + debian/control: + - Remove Debian's VCS fields: that's not where the Ubuntu packages are + maintained. + + -- Christopher James Halse Rogers Sat, 10 Nov 2007 17:42:58 +1100 + +kvm (48+dfsg-1) unstable; urgency=low + + * Adopt package with Baruch Even's permission + * New upstream release + + -- Jan Luebbe Thu, 25 Oct 2007 11:15:54 +0200 + +kvm (46+dfsg-0.1) unstable; urgency=low + + * Non-maintainer upload (low threshold nmu) + * New upstream release + * Adapt sf-get-orig-source from gnome-pkg-tools + * Repackage tarball to remove elpin VGA bios (closes: #440472) + * Add debian/watch file + + -- Jan Luebbe Sun, 14 Oct 2007 12:02:54 +0200 + +kvm (36-0.1) unstable; urgency=low + + * Non-maintainer upload (with permission) + * New upstream release (closes: #438412) + * Update patches + * Install documentation from qemu to /usr/share/doc/kvm to avoid conflicts + and refer to it from kvm(1) (closes: #434729) + * Rename conflicting manpages + * Add texi2html as a Build-Dependency + * Make module-assistant a Dependency of kvm-source because it is needed by + it's debian/rules + * debian/conffiles is not necessary for /etc + + -- Jan Luebbe Mon, 27 Aug 2007 18:45:36 +0200 + +kvm (1:28-4ubuntu3) hardy; urgency=low + + * debian/patches/from-debian-qemu/63_use_dev_bus_usb_not_proc_bus_usb.patch: + + Fixes broken USB device access since /proc/bus/usb/devices was replaced by + /dev/bus/usb/devices. (LP #156085) + + -- TJ Mon, 29 Oct 2007 13:00:00 +0000 + +kvm (1:28-4ubuntu2) gutsy; urgency=low + + * debian/rules: + + Call dh_installudev again (LP #127704). We have a slightly different + udev policy to Debian. + * debian/preinst: + + Remove code to delete old kvm.rules file. The file it references was + never in the Ubuntu packages, and we use dh_installudev now. + * debian/control: + + Demote the Recommends on kvm-source to Suggests. kvm works with the + kernel modules we ship, so the kvm-source package doesn't add much. + + -- Christopher James Halse Rogers Sat, 29 Sep 2007 18:53:27 +1000 + +kvm (1:28-4ubuntu1) gutsy; urgency=low + + * Merge from Debian Unstable (LP: #119254, #122113). + * Remaining Ubuntu Changes: + + Add epoch + + debian/control + - Mention that the kvm-source package is unnecessary. + * Add epoch to the Conflicts + + -- Christopher James Halse Rogers (RAOF) Mon, 25 Jun 2007 22:49:27 +1000 + +kvm (28-4) unstable; urgency=low + + * Divert kernel modules when installing the kvm-source modules + (Closes: #429851) + * kvm-ifup, even if bridge command failed continue to work, this will allow + users who have no bridge setup and intend to setup some other method to + get it to work without messing with the package files. (Closes: #407459) + + -- Baruch Even Thu, 21 Jun 2007 12:37:54 +0100 + +kvm (28-3) unstable; urgency=low + + * Fix infinite loop in kvm-ifup script + + -- Baruch Even Mon, 18 Jun 2007 20:51:50 +0100 + +kvm (28-2) unstable; urgency=low + + * We moved a file from kvm-source to kvm, to be able to properly upgrade we + specify a conflict against older versions (Closes: #417652) + * Fix kvm-ifup script to work in more conditions (Closes: #417151) + * Remove old /etc/udev/kvm.rules since it's not needed (Closes: #414331) + + -- Baruch Even Sun, 17 Jun 2007 21:13:07 +0100 + +kvm (28-1) unstable; urgency=low + + * New upstream release (Closes: #422197) + - Should fix oops (Closes: #418928) + * kqemu is no longer in non-free (Closes: #419152) + + -- Baruch Even Sun, 17 Jun 2007 10:32:40 +0100 + +kvm (18-1) unstable; urgency=low + + * New upstream release (Closes: #416926) + * Move the module-assistant script to the kvm package from kvm-source so all + users will benefit from the integration (Closes: #416122) + * Remove patch to add qemu-ifup and kvm initscript, they are now part of kvm directly. + + -- Baruch Even Sat, 31 Mar 2007 21:00:34 +0300 + +kvm (1:16-1ubuntu2) feisty; urgency=low + + * Revert to kvm-16 to match released kernel. + * Add epoch. + + -- Ben Collins Sun, 15 Apr 2007 17:52:01 -0400 + +kvm (16-1ubuntu1) feisty; urgency=low + + * New upstream. + + -- Ben Collins Wed, 14 Mar 2007 00:33:11 -0400 + +kvm (15-1ubuntu1) feisty; urgency=low + + * New upstream. + + -- Ben Collins Thu, 1 Mar 2007 22:15:02 -0500 + +kvm (14-1) unstable; urgency=medium + + [ Leonard Norrgård ] + * New upstream version. KVM is now based on qemu-0.9.0. + * Suggest etherboot and actually suggest hal (was only mentioning it). + * Update copyright info. + * Add a couple of patches from Debian qemu: 22_net_tuntap_stall.patch, + 04_do_not_print_rtc_freq_if_ok.patch, 62_linux_boot_nasm.patch (62_* + currently only to avoid a buildd FTBS problem). + * Reorder the first two paragraphs in the description for kvm so the + general description is first, the more technical second. + * Moved adduser to Pre-Depends, as we rely on it for installation. + * For a detailed changelog, please see: + svn log -v -r 2227:2383 svn://svn.debian.org/svn/collab-maint/ext-maint/kvm/trunk + + [ Baruch Even ] + * Update the uploader name of Leonard so that lintian won't think it's an + NMU. + * Add XS-Vcs-Browser field + + -- Baruch Even Sat, 24 Feb 2007 17:43:42 +0200 + +kvm (13-1) UNRELEASED; urgency=low + + * New upstream version. + + -- Leonard Norrgård Sat, 10 Feb 2007 07:40:59 +0200 + +kvm (12-1) unstable; urgency=high + + * New upstream version. Most important upstream changes: + - Attempting to reboot Linux guest no longer reboots host on AMD, + actual guest reboot still not possible. + - The option -no-acpi is no longer required to install Windows + (the option is still recommended as the Windows ACPI HAL will + eat a lot of cpu time). + + -- Leonard Norrgard Sun, 23 Jan 2007 18:54:17 +0200 + +kvm (11-2) unstable; urgency=low + + [ Baruch Even ] + * Make the quilt include part conditional so we don't have to have it when + building the kernel module. (Closes: #407447, #407482) + * Do not recommend linux-image-2.6 in kvm-source, and move linux-headers-2.6 + from depends to suggests where it belongs. The package can build from + vanilla kernels as well as Debian kernels. (Closes: #407729) + + [ Leonard Norrgard ] + * Enhance manual page a bit. + + -- Baruch Even Sun, 21 Jan 2007 09:05:38 +0200 + +kvm (11-1) unstable; urgency=high + + * New upstream version. Closes #406800, #406275, #404075. + * This version fixes many stability issues in earlier versions of KVM. + * Automatically create group kvm on installation of package kvm + * Added udev support to automatically set group kvm on /dev/kvm + * Added reportbug script (/usr/share/bug/kvm) so some info that + might be relevant gets included automatically. + * Tell module-assistant about the kvm-source package, so it shows up + in the module selection menu. + * Add information on building the modules using module-assistant. + * Add /etc/kvm/kvm-ifup script (conffile) to bring up the network for + the VM in a simpler way, see the manual page for kvm for description. + This used to be /etc/qemu-ifup, as installed by the qemu package. + * Depend on iproute, bridge-utils, used by kvm-ifup and the upcoming + /etc/init.d script. + * Remove non-x86 bios images - KVM is only meaningful for x86 guests. + * Keep KVM bios files in /usr/share/kvm, rather than sharing them with + other packages as the KVM bios is different (also avoids unexpected + bios updates). + * Don't depend on qemu, as we now keep our own bios. + * Recommend kvm-source, qemu (mostly for qemu-img), vde2 and linux-image-2.6. + * Suggest sudo and debootstrap. + * For kvm-source, depend on linux-headers-2.6 | linux-source-2.6, + recommend linux-image-2.6 and suggest module-assistant and + kernel-package. + * Use quilt to handle patches. + * More detailed package description for kvm, added Homepage:. + + -- Leonard Norrgard Sun, 14 Jan 2007 07:11:03 +0200 + +kvm (7-1) unstable; urgency=low + + * New upstream version + * Install the Intel and AMD modules (Closes: 402820) + + -- Baruch Even Wed, 13 Dec 2006 09:19:44 +0200 + +kvm (5-2) unstable; urgency=low + + * Yet another attempt to fix building on amd64. + + -- Baruch Even Wed, 6 Dec 2006 08:35:04 +0200 + +kvm (5-1) unstable; urgency=low + + * New upstream version + * Really fix building on amd64 (Closes: #400549) + + -- Baruch Even Wed, 6 Dec 2006 07:12:30 +0200 + +kvm (4-2) unstable; urgency=low + + * Allow build on amd64 arch, it really should mean Intel x86 64bit arches, + kvm still doesn't support AMD SVM instructions and requires the Intel + CPUs. (Closes: #400549) + + -- Baruch Even Tue, 28 Nov 2006 22:16:08 +0200 + +kvm (4-1) unstable; urgency=low + + * New upstream version. + + -- Baruch Even Tue, 21 Nov 2006 22:23:26 +0200 + +kvm (3-2) unstable; urgency=low + + * Use KERNEL_DIR variable when building the module to enable building a + module for a kernel that is not being run right now. (Closes: #399603) + * Add manpage that refers the user to qemu(1) where he can find all the + information he needs. + + -- Baruch Even Tue, 21 Nov 2006 09:22:57 +0200 + +kvm (3-1) unstable; urgency=low + + * New upstream version. + * Use upstream versioning of natural numbers. + * First upload to Debian (Closes: #398458) + + -- Baruch Even Wed, 15 Nov 2006 23:58:12 +0200 + +kvm (0.0.2-1) unstable; urgency=low + + * Initial release + + -- Baruch Even Tue, 14 Nov 2006 20:49:57 +0200 --- kvm-53+dfsg.orig/debian/preinst.modules.in +++ kvm-53+dfsg/debian/preinst.modules.in @@ -0,0 +1,31 @@ +#!/bin/sh + +set -e + +drivers="kvm kvm-intel kvm-amd" +dir=/lib/modules/@KERNEL@/kernel/drivers/kvm + +case "${1}" in + install|upgrade) + for driver in $drivers; do + if [ -e "$dir/$driver.ko" ]; then + dpkg-divert --package kvm-modules-@KERNEL@ --add --rename \ + --divert $dir/$driver.ko.linux \ + $dir/$driver.ko + fi + done + ;; + + abort-upgrade) + + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- kvm-53+dfsg.orig/debian/control.modules.in +++ kvm-53+dfsg/debian/control.modules.in @@ -0,0 +1,20 @@ +Source: kvm +Section: misc +Priority: optional +Maintainer: Baruch Even +Build-Depends: debhelper (>> 4.0.0) +Standards-Version: 3.7.2 + +Package: kvm-modules-_KVERS_ +Architecture: any +Provides: kvm-modules +Description: kvm modules for Linux (kernel _KVERS_). + This package contains the set of loadable kernel modules for the + KVM module that provides Kernel Virtual Machine services. + . + 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 kvm-modules. The kvm-source package has been + provided for use with the Debian's module-assistant or kernel-package + utilities to produce a version of kvm-module for your kernel. --- kvm-53+dfsg.orig/debian/compat +++ kvm-53+dfsg/debian/compat @@ -0,0 +1 @@ +5 --- kvm-53+dfsg.orig/debian/README.Debian +++ kvm-53+dfsg/debian/README.Debian @@ -0,0 +1,42 @@ +KVM for Debian +-------------- + +Please see ./README for a description of the kvm software. + +The Debian kvm source package provides two packages, + + 1) kvm, which the provides the userspace daemon + 2) kvm-source, which provides the source for the kernel modules + +It is important to install the kvm-source package and build the kernel +modules as described below and then install the newly built modules +package. Without it KVM will be very slow. When KVM is operating at +full speed, the virtual machine window title will say "QEMU/KVM". If +the KVM modules are not installed or the user has no write access to +/dev/kvm, the window title will just say "QEMU" and the virtual PC +will be very slow. + +The kvm-source package can be used in several ways, once it has been +installed: + + - If the module-assistant package is installed, the KVM kernel + modules can be automatically built, packaged and installed + with a single command. Simply become root and run the command: + + # module-assistant auto-install --force kvm + + or just: + + # m-a a-i --force kvm + + - Using the make-kpkg(1) command provided by the kernel-package Debian + package. This will produce a corresponding kvm-modules package for + the Debian kernel-image package that you are using. This is "the Debian + way". See the "modules_image" section of the make-kpkg(1) man page. + + - Changing to the /usr/src/modules/kvm/ directory and building as + the README file instructs using "make; make install". This will build + and install a module specific to the system you are building on and is + not under control of the packaging system. + + -- Baruch Even , Tue, 14 Nov 2006 20:49:57 +0200 --- kvm-53+dfsg.orig/debian/reportbug-hook.sh +++ kvm-53+dfsg/debian/reportbug-hook.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# +# kvm reportbug script +# + +echo >&3 +echo >&3 + +if which lshal > /dev/null 2>&1; then + echo 'selected information from lshal(1):' >&3 + echo >&3 + lshal | egrep '^ (system\.(vendor|product)|smbios)' >&3 + echo >&3 + echo >&3 +fi + +if [ -r /proc/cpuinfo ]; then + echo /proc/cpuinfo: >&3 + echo >&3 + cat /proc/cpuinfo >&3 + echo >&3 + echo >&3 +fi --- kvm-53+dfsg.orig/debian/patches/06_no_system_linux_kvm_h.patch +++ kvm-53+dfsg/debian/patches/06_no_system_linux_kvm_h.patch @@ -0,0 +1,25 @@ + +Avoid including system header for linux/kvm.h - otherwise we will fail +when the system has older headers than what we're really trying to +compile, for example a Linux 2.6.20 host with 2.6.20 Linux headers +installed would fail. + +Index: user/kvmctl.h +=================================================================== +--- user/kvmctl.h.orig ++++ user/kvmctl.h +@@ -11,12 +11,12 @@ + #define __user /* temporary, until installed via make headers_install */ + #endif + +-#include ++#include "linux/kvm.h" + + #define u32 uint32_t /* older kvm_para.h had a u32 exposed */ + #define u64 uint32_t /* older kvm_para.h had a u32 exposed */ + #define PAGE_SIZE 4096 +-#include ++#include "linux/kvm_para.h" + #undef u32 + #undef u64 + #undef PAGE_SIZE --- kvm-53+dfsg.orig/debian/patches/from-debian-qemu/22_net_tuntap_stall.patch +++ kvm-53+dfsg/debian/patches/from-debian-qemu/22_net_tuntap_stall.patch @@ -0,0 +1,19 @@ +Patch from Debian QEMU (SVN r95), see bugs.debian.org #290569 for +documentation: + +Fix TUN/TAP nwtwork interface stalling the connection. (Closes: #290569) +Thanks to Vitaly Belostotsky . + +Index: qemu/vl.c +=================================================================== +--- qemu/vl.c.orig 2007-03-31 20:59:32.000000000 +0300 ++++ qemu/vl.c 2007-03-31 20:59:35.000000000 +0300 +@@ -3269,7 +3269,7 @@ + return -1; + } + memset(&ifr, 0, sizeof(ifr)); +- ifr.ifr_flags = IFF_TAP | IFF_NO_PI; ++ ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE; + if (ifname[0] != '\0') + pstrcpy(ifr.ifr_name, IFNAMSIZ, ifname); + else --- kvm-53+dfsg.orig/debian/patches/from-debian-qemu/63_use_dev_bus_usb_not_proc_bus_usb.patch +++ kvm-53+dfsg/debian/patches/from-debian-qemu/63_use_dev_bus_usb_not_proc_bus_usb.patch @@ -0,0 +1,14 @@ +Fixes broken USB device access since /proc/bus/usb/devices was replaced by /dev/bus/usb/devices. (LP #156085) +Index: kvm-28/qemu/usb-linux.c +=================================================================== +--- kvm-28.orig/qemu/usb-linux.c 2007-10-29 13:59:17.000000000 +0000 ++++ kvm-28/qemu/usb-linux.c 2007-10-29 13:59:26.000000000 +0000 +@@ -49,7 +49,7 @@ + + //#define DEBUG + +-#define USBDEVFS_PATH "/proc/bus/usb" ++#define USBDEVFS_PATH "/dev/bus/usb" + #define PRODUCT_NAME_SZ 32 + + typedef struct USBHostDevice { --- kvm-53+dfsg.orig/debian/patches/from-debian-qemu/62_linux_boot_nasm.patch +++ kvm-53+dfsg/debian/patches/from-debian-qemu/62_linux_boot_nasm.patch @@ -0,0 +1,59 @@ +Taken from Debian's qemu-0.8.2. Buildd fails building kvm on amd64 without this. + +#DPATCHLEVEL=0 +Index: qemu/pc-bios/linux_boot.asm +=================================================================== +--- /dev/null ++++ qemu/pc-bios/linux_boot.asm +@@ -0,0 +1,31 @@ ++; ++; QEMU Boot sector to launch a preloaded Linux kernel ++; Copyright (c) 2004 Fabrice Bellard ++; Copyright (c) 2006 Guillem Jover ++; ++ ++LOAD_SEG equ 0x9000 ++ ++bits 16 ++global _start ++ ++section .text ++ ++_start: ++ cli ++ cld ++ mov ax, LOAD_SEG ++ mov ds, ax ++ mov es, ax ++ mov fs, ax ++ mov gs, ax ++ mov ss, ax ++ mov sp, 0x8ffe ++ jmp LOAD_SEG + 0x20:0 ++ ++ times 510 - ($ - $$) db 0 ++ ++ ; boot sector signature ++ db 0x55 ++ db 0xaa ++ +Index: qemu/pc-bios/Makefile +=================================================================== +--- qemu/pc-bios/Makefile.orig ++++ qemu/pc-bios/Makefile +@@ -5,12 +5,12 @@ + + DEFINES= + +-TARGETS= ++TARGETS+=linux_boot.bin + + all: $(TARGETS) + +-%.o: %.S +- $(CC) $(DEFINES) -c -o $@ $< ++linux_boot.bin: linux_boot.asm ++ nasm -f bin -o $@ $< + + clean: + rm -f $(TARGETS) *.o *~ --- kvm-53+dfsg.orig/debian/patches/02_fix_kernel_Makefile.patch +++ kvm-53+dfsg/debian/patches/02_fix_kernel_Makefile.patch @@ -0,0 +1,10 @@ +Index: trunk/kernel/Makefile +=================================================================== +--- trunk.orig/kernel/Makefile 2007-03-31 21:36:36.000000000 +0300 ++++ trunk/kernel/Makefile 2007-03-31 21:36:47.000000000 +0300 +@@ -1,5 +1,3 @@ +-include ../config.mak +- + KVERREL = $(patsubst /lib/modules/%/build,%,$(KERNELDIR)) + + DESTDIR= --- kvm-53+dfsg.orig/debian/patches/01_use_bios_files_in_usr_share_kvm.patch +++ kvm-53+dfsg/debian/patches/01_use_bios_files_in_usr_share_kvm.patch @@ -0,0 +1,13 @@ +Index: qemu/configure +=================================================================== +--- qemu/configure.orig ++++ qemu/configure +@@ -666,7 +666,7 @@ + prefix="/usr/local" + fi + mansuffix="/share/man" +- datasuffix="/share/qemu" ++ datasuffix="/share/kvm" + docsuffix="/share/doc/qemu" + binsuffix="/bin" + fi --- kvm-53+dfsg.orig/debian/patches/04_use_etc_kvm_kvm-ifup.patch +++ kvm-53+dfsg/debian/patches/04_use_etc_kvm_kvm-ifup.patch @@ -0,0 +1,14 @@ + +Use an independent script to control the network at startup. + +--- qemu/vl.c~ 2007-02-15 18:07:00.000000000 +0200 ++++ qemu/vl.c 2007-02-15 18:57:50.000000000 +0200 +@@ -92,7 +92,7 @@ + #include "qemu-kvm.h" + #endif + +-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" ++#define DEFAULT_NETWORK_SCRIPT "/etc/kvm/kvm-ifup" + #ifdef __sun__ + #define SMBD_COMMAND "/usr/sfw/sbin/smbd" + #else --- kvm-53+dfsg.orig/debian/patches/07_change_qemu_docdir.patch +++ kvm-53+dfsg/debian/patches/07_change_qemu_docdir.patch @@ -0,0 +1,13 @@ +Index: trunk/qemu/configure +=================================================================== +--- trunk.orig/qemu/configure ++++ trunk/qemu/configure +@@ -667,7 +667,7 @@ + fi + mansuffix="/share/man" + datasuffix="/share/kvm" +- docsuffix="/share/doc/qemu" ++ docsuffix="/share/doc/kvm" + binsuffix="/bin" + fi + --- kvm-53+dfsg.orig/debian/patches/08_default_tdf.patch +++ kvm-53+dfsg/debian/patches/08_default_tdf.patch @@ -0,0 +1,33 @@ +Index: kvm-52+dfsg/qemu/vl.c +=================================================================== +--- kvm-52+dfsg.orig/qemu/vl.c 2007-11-15 02:15:00.649606830 +0100 ++++ kvm-52+dfsg/qemu/vl.c 2007-11-15 02:16:47.998947070 +0100 +@@ -7432,7 +7432,7 @@ + #ifndef _WIN32 + "-daemonize daemonize QEMU after initializing\n" + #endif +- "-tdf inject timer interrupts that got lost\n" ++ "-no-tdf do not inject timer interrupts that got lost\n" + "-kvm-shadow-memory megs set the amount of shadow pages to be allocated\n" + "-option-rom rom load a file, rom, into the option ROM space\n" + #ifdef TARGET_SPARC +@@ -7651,7 +7651,7 @@ + #if defined(TARGET_ARM) || defined(TARGET_M68K) + { "semihosting", 0, QEMU_OPTION_semihosting }, + #endif +- { "tdf", 0, QEMU_OPTION_tdf }, /* enable time drift fix */ ++ { "no-tdf", 0, QEMU_OPTION_tdf }, /* disable time drift fix */ + { "kvm-shadow-memory", HAS_ARG, QEMU_OPTION_kvm_shadow_memory }, + { "name", HAS_ARG, QEMU_OPTION_name }, + #if defined(TARGET_SPARC) +@@ -8479,8 +8479,8 @@ + semihosting_enabled = 1; + break; + case QEMU_OPTION_tdf: +- time_drift_fix = 1; +- break; ++ time_drift_fix = 0; ++ break; + case QEMU_OPTION_kvm_shadow_memory: + kvm_shadow_memory = (int64_t)atoi(optarg) * 1024 * 1024 / 4096; + break; --- kvm-53+dfsg.orig/debian/patches/series +++ kvm-53+dfsg/debian/patches/series @@ -0,0 +1,9 @@ +01_use_bios_files_in_usr_share_kvm.patch -p0 +02_fix_kernel_Makefile.patch +04_use_etc_kvm_kvm-ifup.patch -p0 +#06_no_system_linux_kvm_h.patch -p0 +from-debian-qemu/22_net_tuntap_stall.patch -p0 +from-debian-qemu/62_linux_boot_nasm.patch -p0 +07_change_qemu_docdir.patch +08_default_tdf.patch -p1 +from-debian-qemu/63_use_dev_bus_usb_not_proc_bus_usb.patch --- kvm-53+dfsg.orig/debian/copyright +++ kvm-53+dfsg/debian/copyright @@ -0,0 +1,56 @@ +This package was debianized by Baruch Even on +Tue, 14 Nov 2006 20:49:57 +0200. + +It was downloaded from http://kvm.qumranet.com/ + +The source tarball has been repackaged to remove the elpin vgabios. Use +debian/rules get-orig-source to produce a clean source tarball. + +Upstream Author: Yaniv Kamay + Avi Kivity + +Copyright: Copyright (C) 2006 Qumranet, Inc. + +License: + +KVM Kernel module: + + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + +KVM User code: + + Copyright (C) 2006 Qumranet. + + The files in this directory and its subdirectories are licensed under the + GNU LGPL, version 2. + +QEMU: + + The following points clarify the QEMU licenses: + + 1) The QEMU virtual CPU core library (libqemu.a) and the QEMU PC + system emulator are released under the GNU Lesser General Public + License. + + 2) The Linux user mode QEMU emulator is released under the GNU General + Public License. + + 3) QEMU is a trademark of Fabrice Bellard. + +BIOS files in QEMU: + + bios.bin: Copyright (C) 2002 MandrakeSoft S.A. This file is + licensed under the GNU LGPL, version 2, or (at your option) + any later version. Homepage: http://sourceforge.net/projects/bochs + + vgabios.bin and vgabios-cirrus.bin: (C) 2003 the LGPL VGABios + developers Team. These files are licensed under the GNU LGPL, + version 2, or (at your option) any later version. Homepage: + http://savannah.nongnu.org/projects/vgabios + +The Debian packaging is: + (C) 2006, Baruch Even + (C) 2006, 2007 Leonard Norrgard + (C) 2007 Jan Luebbe +It is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- kvm-53+dfsg.orig/debian/kvm-source.dirs +++ kvm-53+dfsg/debian/kvm-source.dirs @@ -0,0 +1 @@ +usr/src --- kvm-53+dfsg.orig/debian/preinst +++ kvm-53+dfsg/debian/preinst @@ -0,0 +1,45 @@ +#!/bin/sh +# Debian kvm package pre-installation script +# Copyright (C) 2007 Leonard Norrgard, Refactor, Finland +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +GROUP=kvm + +# Workaround for bug in addgroup +. /etc/adduser.conf +[ -z "$FIRST_SYSTEM_UID" ] && exit 1 +[ -z "$LAST_SYSTEM_UID" ] && exit 2 + +GID=$(grep ${GROUP} /etc/group >/dev/null && grep ${GROUP} /etc/group | cut -d ':' -f 3) + +if [ -n "$GID" ] \ + && [ "$GID" -lt "$FIRST_SYSTEM_UID" \ + -o "$GID" -gt "$LAST_SYSTEM_UID" ]; then + cat >&2 <&2 "Error: failed to add the group ${GROUP}." + exit 4 + fi +else + echo >&2 "kvm: Using the existing group \"$GROUP\" (gid $GID) for /dev/kvm" +fi + +#DEBHELPER# + +exit 0 --- kvm-53+dfsg.orig/debian/control +++ kvm-53+dfsg/debian/control @@ -0,0 +1,70 @@ +Source: kvm +Section: misc +Priority: optional +XSBC-Original-Maintainer: Jan Luebbe +Maintainer: Ubuntu MOTU Developers +Build-Depends: debhelper (>= 5), quilt (>= 0.40), autotools-dev, bzip2, + uuid-dev, zlib1g-dev, libsdl1.2-dev, gcc-3.4, libasound2-dev, nasm, texi2html +Standards-Version: 3.7.2 + +Package: kvm +Architecture: i386 amd64 +Pre-Depends: adduser +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, bridge-utils, vgabios (>= 0.5a-1), bochsbios-qemu +Recommends: qemu, vde2, linux-image-2.6 +Suggests: kvm-source, sudo, debootstrap, hal, etherboot +Conflicts: kvm-source (<= 18-1) +Homepage: http://kvm.qumranet.com/ +Description: Full virtualization on x86 hardware + Using KVM, one can run multiple virtual PC:s, each running unmodified Linux or + Windows images. Each virtual machine has private virtualized hardware: a + network card, disk, graphics adapter, etc. + . + KVM (for Kernel-based Virtual Machine) is a full virtualization solution for + Linux hosts on x86 hardware with x86 guests. KVM is intended for systems where + the processor has hardware support for virtualization, see below for details. + All combinations of 32-bit and 64-bit host and guest systems are supported, + except 64-bit guests on 32-bit hosts. + . + For the best performance the processor must support hardware virtualization, + provided by AMD's SVM capability and Intel's VT. To find out if your + processor has the necessary support, do as follows: + . + * Make sure you run Linux 2.6.16 or newer for AMD processors, or + Linux 2.6.15 for Intel processors. Older Linux versions do not report + the virtualization capabilities. + . + * Run this command in a shell: egrep '^flags.*(vmx|svm)' /proc/cpuinfo + . + If it prints anything, the processor provides hardware virtualization + support and is suitable for use with KVM. + . + Without hardware support, KVM falls back to the considerably slower QEMU-based + software virtualization. In this case, it makes more sense to use the qemu + package, possibly with the kqemu package for better performance. + . + The recommended qemu package contains the the qemu-img program needed to create + virtual disk images as well as the script /usr/sbin/qemu-make-debian-root, + which uses debootstrap to build a debian disk image. See the man page + for qemu-make-debian-root. The suggested hal package is only used for + automatically reporting the system bios version and computer model when + reporting bugs. The suggested etherboot package contains Etherboot + ROM images for, among others, the NE2000, PCNET and RTL8139 ethernet cards + emulated (see appendix A. List of supported NICs in the package etherboot-doc). + . + KVM consists of two loadable kernel modules (kvm.ko and kvm-amd.ko or + kvm-intel.ko) and a userspace component. This package contains the userspace + component, while kvm-source provides the module source. + +Package: kvm-source +Architecture: all +Depends: debhelper (>>4.0.0), make, bzip2, module-assistant +Suggests: kernel-package, linux-headers-2.6 | linux-source-2.6 +Enhances: kvm +Homepage: http://kvm.qumranet.com/ +Description: Source for the KVM driver + This package provides the source code for the KVM kernel modules. + The kvm package is also required in order to make use of these + modules. Kernel source or headers are required to compile these modules. + . + NOT needed for Ubuntu systems --- kvm-53+dfsg.orig/debian/links +++ kvm-53+dfsg/debian/links @@ -0,0 +1,3 @@ +usr/share/bochs/BIOS-bochs-latest-qemu usr/share/kvm/bios.bin +usr/share/vgabios/vgabios.bin usr/share/kvm/vgabios.bin +usr/share/vgabios/vgabios.cirrus.bin usr/share/kvm/vgabios-cirrus.bin --- kvm-53+dfsg.orig/debian/rules +++ kvm-53+dfsg/debian/rules @@ -0,0 +1,340 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# This version is for a hypothetical package that can build a kernel modules +# architecture-dependant package via make-kpkg, as well as an +# architecture-independent module source package, and other packages +# either dep/indep for things like common files or userspace components +# needed for the kernel modules. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifeq (i386,$(shell dpkg-architecture -qDEB_BUILD_ARCH)) + BUILD_CPU = i386 + QEMU_EXE = qemu-system-x86_64 +else + BUILD_CPU = x86_64 + QEMU_EXE = qemu-system-x86_64 +endif + +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:=kvm-source + +# The short upstream name, used for the module source directory +sname:=kvm + +### 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=kvm-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_config 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: + $(MAKE) KERNELDIR=$(KSRC) KVERREL=$(KVERS) clean +# rm -f driver/*.o driver/*.ko +# +### end KERNEL SETUP + +config.status: configure + dh_testdir + # Add here commands to configure the package. + ./configure --qemu-cc=gcc-3.4 --prefix=/usr + + +build-arch: config.status build-arch-stamp +build-arch-stamp: + dh_testdir + + # Add here command to compile/build the package. + $(MAKE) qemu +# $(MAKE) -C qemu/pc-bios + touch $@ + +# 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: + dh_testroot + dh_clean -k + dh_installdirs lib/modules/$(KVERS)/misc + + # Build the modules + $(MAKE) KERNELDIR=$(KSRC) KVERREL=$(KVERS) + + # Install the modules + cp kvm.ko kvm-intel.ko kvm-amd.ko debian/$(PKGNAME)/lib/modules/$(KVERS)/misc + + dh_installdocs + dh_installchangelogs + dh_installmodules + sed -e "s/@KERNEL@/$(KVERS)/g" debian/preinst.modules.in > debian/preinst + sed -e "s/@KERNEL@/$(KVERS)/g" debian/postrm.modules.in > debian/postrm + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol -- -v$(VERSION) + dh_md5sums + dh_builddeb --destdir=$(DEB_DESTDIR) + dh_clean -k + +build-indep: config.status build-indep-stamp +build-indep-stamp: + dh_testdir + + # Add here command to compile/build the arch indep package. + # It's ok not to do anything here, if you don't need to build + # anything for this package. + #docbook-to-man debian/kvm.sgml > kvm.1 + + touch $@ + +build: patch build-arch build-indep + +clean: unpatch + dh_testdir + #dh_testroot + rm -f build-arch-stamp build-indep-stamp + rm -rf qemu/$(BUILD_CPU)-softmmu + rm -f config.sub config.guess + + # Add here commands to clean up after the build process. +# -$(MAKE) -C qemu/pc-bios clean + -$(MAKE) -C qemu distclean + -$(MAKE) clean + + dh_clean + +ifneq "$(wildcard /usr/share/quilt/quilt.make)" "" +include /usr/share/quilt/quilt.make +endif + +ifeq (1, 1) + +# Removing non-x86 bioses + linux_boot.bin which currently escapes to the metal +unwanted_bios_files = ppc_rom.bin openbios-sparc32 video.x pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin bios.bin vgabios.bin vgabios-cirrus.bin + +else + +qemu_bios_files = bios.bin vgabios.bin vgabios-cirrus.bin video.x + +endif + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Create the directories to install the source into + dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian + + # Make qemu's "make install" happy + for i in $(unwanted_bios_files); do \ + touch qemu/pc-bios/$$i; \ + done + # Build & install normally, remove extraneous files + $(MAKE) -C libkvm DESTDIR=$(CURDIR)/debian/$(sname) install + $(MAKE) -C qemu DESTDIR=$(CURDIR)/debian/$(sname) install + + # Clean up the mess + for i in $(unwanted_bios_files); do \ + rm -f qemu/pc-bios/$$i debian/tmp/usr/share/kvm/$$i; \ + done + + # Add here commands to install the package into debian/kvm. + dh_install + mv $(CURDIR)/debian/kvm/usr/bin/$(QEMU_EXE) $(CURDIR)/debian/kvm/usr/bin/kvm + # Collisions with the qemu package + rm $(CURDIR)/debian/kvm/usr/bin/qemu-img + rm $(CURDIR)/debian/kvm/usr/share/man/man1/qemu-img.1 + mv $(CURDIR)/debian/kvm/usr/share/man/man1/qemu.1 $(CURDIR)/debian/kvm/usr/share/man/man1/kvm-qemu.1 + + ## The /etc/init.d script (not quite ready for prime time yet) + #cp -a scripts/kvm $(CURDIR)/debian/kvm/etc/init.d/ + #dh_installinit --onlyscripts --no-restart-on-upgrade + + install -m 0755 scripts/qemu-ifup $(CURDIR)/debian/kvm/etc/kvm/kvm-ifup + install -m 0755 debian/reportbug-hook.sh $(CURDIR)/debian/kvm/usr/share/bug/kvm + + # Upstream does this though it is wrong for Debian, but installing it + # properly with dh_py* would makes it clash with the binary /usr/bin/kvm + # This seems likely to change in coming versions as upstream also + # has /usr/bin/kvm. + install -m 0755 kvm $(CURDIR)/debian/kvm/etc/kvm/utils/kvm + + # Remove unwanted bios files + for i in $(unwanted_bios_files); do \ + rm -f $(CURDIR)/debian/kvm/usr/share/kvm/$$i; \ + done + + # kvm-source + # Copy only the driver source to the proper location + cp -r kernel/* debian/$(psource)/usr/src/modules/$(sname) + # Copy the needed debian/ pieces to the proper location + cp debian/*modules.in* \ + debian/$(psource)/usr/src/modules/$(sname)/debian + cp 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 + # tell module-assistant about the kvm modules, so they show up in the list menu + ln -s default.sh $(CURDIR)/debian/kvm/usr/share/modass/packages/$(psource) + + # Remove things we don't package at all, would be a "kvm-dev" package + rm -Rf $(CURDIR)/debian/kvm/usr/include/linux/ + rm -Rf $(CURDIR)/debian/kvm/usr/include + rm -Rf $(CURDIR)/debian/kvm/usr/lib* + + +# Build architecture-independent files here. +# Pass -i to all debhelper commands in this target to reduce clutter. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installdocs -i +# dh_installexamples -i +# dh_install -i +# dh_installmenu -i +# dh_installdebconf -i +# dh_installlogrotate -i +# dh_installemacsen -i +# dh_installpam -i +# dh_installmime -i +# dh_installinit -i +# dh_installcron -i +# dh_installinfo -i + dh_installman -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i +# dh_perl -i +# dh_python -i +# dh_makeshlibs -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -s + dh_testroot -s +# dh_installdebconf -s + dh_installdocs -s +# dh_installexamples -s +# dh_installmenu -s +# dh_installlogrotate -s +# dh_installemacsen -s +# dh_installpam -s +# dh_installmime -s +# dh_installinit -s +# dh_installcron -s + dh_installman -s debian/kvm.1 + dh_installudev -s --priority=45 +# dh_installinfo -s + dh_installchangelogs -s + dh_strip -s + dh_link -s + dh_compress -s + dh_fixperms -s +# dh_makeshlibs -s + dh_installdeb -s +# dh_perl -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch + +# get-orig-source adapted from /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk from the gnome-pkg-tools package +# copied from CDBS' buildvars +DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/+[^-]*-[^-]*$$//') + +# where to store the resulting .orig tarball +DEB_TARBALL_DOWNLOAD_DIR ?= ../tarballs +TARBALL_EXT ?= tar.gz + +SF_PROJECT ?= $(DEB_SOURCE_PACKAGE) +SF_MODULE ?= $(DEB_SOURCE_PACKAGE) +SF_TARBALL ?= $(SF_MODULE)-$(DEB_UPSTREAM_VERSION).$(TARBALL_EXT) +SF_DOWNLOAD_URL ?= http://$$sf_mirror.dl.sourceforge.net/$(SF_PROJECT)/$(SF_TARBALL) +SF_MIRRORS ?= belnet easynews heanet internap jaist kent mesh nchc optusnet ovh puzzle superb-east superb-west surfnet switch ufpr umn +SF_DOWNLOAD_COMMAND ?= for sf_mirror in $(SF_MIRRORS); do wget -N -nv -T10 -t1 -O $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) $(SF_DOWNLOAD_URL) && break; done + +get-orig-source: + dh_testdir + @@echo 'Source package: $(DEB_SOURCE_PACKAGE)' + @@echo 'Source package: $(DEB_VERSION)' + @@echo 'Source version without epoch: $(DEB_NOEPOCH_VERSION)' + @@echo 'Upstream version (for orig tarball): $(DEB_UPSTREAM_VERSION)' + mkdir -p $(DEB_TARBALL_DOWNLOAD_DIR) + $(SF_DOWNLOAD_COMMAND) + case "$(TARBALL_EXT)" in \ + tar.bz2|tbz) \ + bzcat $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) | \ + gzip -9 >$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz ; \ + rm -f $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) \ + ;;\ + esac + cd $(DEB_TARBALL_DOWNLOAD_DIR) && \ + tar xzf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz && \ + rm -f $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/bios/VGABIOS* && \ + rm -f $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/bios/*.bin && \ + rm -f $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/qemu/pc-bios/openbios* && \ + rm -f $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/qemu/pc-bios/*.bin && \ + tar c $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) | \ + gzip -9 >$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz + + +.PHONY: build clean binary-indep binary-arch binary install binary-modules kdist kdist_configure kdist_config kdist_image kdist_clean