← Back to branch summary

~ubuntu-branches/ubuntu/saucy/qemu/saucy-proposed

« back to all changes in this revision

Viewing changes to .pc/patches-arm-1.4.0/0043-add-hw-omap3_mmc.c.patch/hw/arm/Makefile.objs

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-05-28 08:18:30 UTC
  • mfrom: (1.8.2) (10.1.37 sid)
  • Revision ID: package-import@ubuntu.com-20130528081830-87xl2z9fq516a814
Tags: 1.5.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.5.0+dfs-2 from debian unstable.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - Dropped patches:
    * 0001-fix-wrong-output-with-info-chardev-for-tcp-socket.patch
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * gridcentric patch - updated
    * linaro arm patches from qemu-linaro rebasing branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/patches-arm-1.4.0/0043-add-hw-omap3_mmc.c.patch/hw/arm/Makefile.objs
1
 
obj-y = integratorcp.o versatilepb.o arm_pic.o
2
 
obj-y += arm_boot.o
3
 
obj-y += xilinx_zynq.o zynq_slcr.o
4
 
obj-y += xilinx_spips.o
5
 
obj-y += arm_gic.o arm_gic_common.o
6
 
obj-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o
7
 
obj-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o
8
 
obj-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o
9
 
obj-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o
10
 
obj-y += exynos4210_rtc.o exynos4210_i2c.o
11
 
obj-y += arm_mptimer.o a15mpcore.o
12
 
obj-y += armv7m.o armv7m_nvic.o stellaris.o stellaris_enet.o
13
 
obj-y += highbank.o
14
 
obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
15
 
obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
16
 
obj-y += gumstix.o
17
 
obj-y += zaurus.o ide/microdrive.o spitz.o tosa.o tc6393xb.o
18
 
obj-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
19
 
                omap_gpio.o omap_intc.o omap_uart.o
20
 
obj-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
21
 
                omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o
22
 
obj-y += omap_usb.o omap3_boot.o
23
 
obj-y += omap_sx1.o palm.o tsc210x.o
24
 
obj-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o
25
 
obj-y += mst_fpga.o mainstone.o
26
 
obj-y += z2.o
27
 
obj-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o
28
 
obj-y += framebuffer.o
29
 
obj-y += vexpress.o
30
 
obj-y += strongarm.o
31
 
obj-y += collie.o
32
 
obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
33
 
obj-y += kzm.o
34
 
obj-$(CONFIG_FDT) += ../device_tree.o
35
 
 
36
 
obj-y := $(addprefix ../,$(obj-y))