~ubuntu-branches/ubuntu/trusty/qemu/trusty

« back to all changes in this revision

Viewing changes to debian/qemu-system-x86.links

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-02-04 12:13:08 UTC
  • mfrom: (10.1.45 sid)
  • Revision ID: package-import@ubuntu.com-20140204121308-1xq92lrfs75agw2g
Tags: 1.7.0+dfsg-3ubuntu1~ppa1
* Merge 1.7.0+dfsg-3 from debian.  Remaining changes:
  - debian/patches/ubuntu:
    * expose-vmx_qemu64cpu.patch
    * linaro (omap3) and arm64 patches
    * ubuntu/target-ppc-add-stubs-for-kvm-breakpoints: fix FTBFS
      on ppc
    * ubuntu/CVE-2013-4377.patch: fix denial of service via virtio
  - debian/qemu-system-x86.modprobe: set kvm_intel nested=1 options
  - debian/control:
    * add arm64 to Architectures
    * add qemu-common and qemu-system-aarch64 packages
  - debian/qemu-system-common.install: add debian/tmp/usr/lib
  - debian/qemu-system-common.preinst: add kvm group
  - debian/qemu-system-common.postinst: remove acl placed by udev,
    and add udevadm trigger.
  - qemu-system-x86.links: add eepro100.rom, remove pxe-virtio,
    pxe-e1000 and pxe-rtl8139.
  - add qemu-system-x86.qemu-kvm.upstart and .default
  - qemu-user-static.postinst-in: remove arm64 binfmt
  - debian/rules:
    * allow parallel build
    * add aarch64 to system_targets and sys_systems
    * add qemu-kvm-spice links
    * install qemu-system-x86.modprobe
  - add debian/qemu-system-common.links for OVMF.fd link
* Remove kvm-img, kvm-nbd, kvm-ifup and kvm-ifdown symlinks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
usr/share/seabios/vgabios-qxl.bin usr/share/qemu/vgabios-qxl.bin
11
11
usr/share/seabios/vgabios-stdvga.bin usr/share/qemu/vgabios-stdvga.bin
12
12
usr/share/seabios/vgabios-vmware.bin usr/share/qemu/vgabios-vmware.bin
 
13
# pxe/efi netroms from ipxe-qemu package.
 
14
# Point to old locations for pxe, but use new locations for efi --
 
15
# this way, we can use either old version of ipxe-qemu or new version.
 
16
# Eventually we should switch to path-based search for these files.
13
17
usr/lib/ipxe/pcnet32.rom usr/share/qemu/pxe-pcnet.rom
14
18
usr/lib/ipxe/ns8390.rom usr/share/qemu/pxe-ne2k_pci.rom
 
19
usr/lib/ipxe/eepro100.rom usr/share/qemu/pxe-eepro100.rom
 
20
usr/lib/ipxe/qemu/efi-e1000.rom usr/share/qemu/efi-e1000.rom
 
21
usr/lib/ipxe/qemu/efi-eepro100.rom usr/share/qemu/efi-eepro100.rom
 
22
usr/lib/ipxe/qemu/efi-ne2k_pci.rom usr/share/qemu/efi-ne2k_pci.rom
 
23
usr/lib/ipxe/qemu/efi-pcnet.rom usr/share/qemu/efi-pcnet.rom
 
24
usr/lib/ipxe/qemu/efi-rtl8139.rom usr/share/qemu/efi-rtl8139.rom
 
25
usr/lib/ipxe/qemu/efi-virtio.rom usr/share/qemu/efi-virtio.rom
15
26
usr/lib/ipxe/eepro100.rom usr/share/qemu/eepro100.rom