~ubuntu-branches/ubuntu/jaunty/kvm/jaunty

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland, Reviewed Ubuntu patches with KVM/QEMU upstream, Anthony Liguori, Remaining Patches, Other Changes
  • Date: 2009-02-20 16:11:06 UTC
  • Revision ID: james.westby@ubuntu.com-20090220161106-yznfb2ji5lkwdeov
Tags: 1:84+dfsg-0ubuntu3
[ Reviewed Ubuntu patches with KVM/QEMU upstream, Anthony Liguori ]
* debian/patches/03_bios_no_ssp.patch: DROPPED, included upstream
* debian/patches/06_no_system_linux_kvm_h.patch: DROPPED, no longer
  necessary, kvm kernel header file is now generally available
* debian/patches/from-debian-qemu/22_net_tuntap_stall.patch: DROPPED,
  no longer necessary; this patch was to work around a bug in
  2.6.11-rc1; this patch could be causing network packet drop issues;
  definitely WRONG at this point with modern QEMU
* debian/patches/from-debian-qemu/62_linux_boot_nasm.patch: DROPPED,
  dead code in modern QEMU; completely rewritten to not require an
  external assembler; now built dynamically in pc.c
* debian/patches/SECURITY_CVE-2007-1321+1322+1366+2893.patch: DROPPED
  * CVE-2007-1321: Fixed upstream
    - QEMU svn commit: r3019
  * CVE-2007-1322: Fixed upstream
    - QEMU svn commit: r5921
  * CVE-2007-1366: Fixed upstream
    - QEMU svn commit: r3012
  * CVE-2007-2893: Not related to QEMU
  * dma.c: Non-CVE fix, r3917
  * block.c: Incorrect patch (negative offset IS allowed, switches
    between block and byte offset)
  * Remainder of the patch was split into: net-socket.patch
    (should be sent upstream)
* debian/patches/series: updated accordingly
* debian/patches/do-not-install-bios.patch: DROPPED
  added --disable-blobs to configure in debian/rules
* debian/patches/reenable_audio_drivers.patch: DROPPED
  added --audio-drv-list="oss alsa sdl" to debian/rules
* debian/patches/anon_inodes_fix.patch: DROPPED, this is already
  upstream
* debian/patches/ppc-build.patch: DROPPED, not necessary
* debian/rules: remove references to non-existant linux_boot.bin

[ Remaining Patches ]
* debian/patches/01_use_bios_files_in_usr_share_kvm.patch -p0
  debian/patches/04_use_etc_kvm_kvm-ifup.patch -p0
  debian/patches/07_change_qemu_docdir.patch
  |-----> merged to a single patch, rename_qemu_kvm.patch
* debian/patches/CVE-2008-0928.patch: upstream work in progress
* debian/patches/evdev_keycode_map.patch: upstream work in progress
* debian/patches/02_fix_kernel_Makefile.patch: merged into dkmsify.patch
* debian/patches/dkmsify.patch: Ubuntu-specific (should validate if
  still necessary...)
* debian/patches/net-socket.patch: to be sent upstream

[ Other Changes ]
* scripts/qemu-ifup: bridge device determination was broken, required
  br0 to be present for this script to operate properly, LP: #125302

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
ifeq (i386,$(shell dpkg-architecture -qDEB_BUILD_ARCH))
24
24
        BUILD_CPU = i386
25
25
        QEMU_EXE = qemu-system-x86_64
26
 
        pcbios_targets = linux_boot.bin
 
26
        pcbios_targets =
27
27
        qemu_targets = bios vgabios
28
 
        needed_bios_files = bios.bin vgabios.bin vgabios-cirrus.bin linux_boot.bin \
 
28
        needed_bios_files = bios.bin vgabios.bin vgabios-cirrus.bin \
29
29
                pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \
30
30
                extboot.bin
31
31
endif
32
32
ifeq (amd64,$(shell dpkg-architecture -qDEB_BUILD_ARCH))
33
33
        BUILD_CPU = x86_64
34
34
        QEMU_EXE = qemu-system-x86_64
35
 
        pcbios_targets = linux_boot.bin
 
35
        pcbios_targets =
36
36
        qemu_targets = bios vgabios
37
 
        needed_bios_files = bios.bin vgabios.bin vgabios-cirrus.bin linux_boot.bin \
 
37
        needed_bios_files = bios.bin vgabios.bin vgabios-cirrus.bin \
38
38
                pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \
39
39
                extboot.bin
40
40
endif
49
49
# Removing binary blobs
50
50
unwanted_bios_files = ppc_rom.bin openbios-sparc32 video.x openbios-sparc \
51
51
        openbios-sparc64 bios.bin vgabios.bin vgabios-cirrus.bin bamboo.dtb \
52
 
        pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \
53
 
        linux_boot.bin
 
52
        pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin
54
53
 
55
54
CFLAGS = -Wall -g
56
55
 
63
62
config.status: configure
64
63
        dh_testdir
65
64
        # Add here commands to configure the package.
66
 
        ./configure --prefix=/usr
 
65
        ./configure --prefix=/usr --disable-blobs --audio-drv-list="oss alsa sdl"
67
66
 
68
67
 
69
68
build-arch: patch config.status build-arch-stamp