← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qemu/vivid

« back to all changes in this revision

Viewing changes to Makefile.objs

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-02-25 22:31:43 UTC
  • mfrom: (1.8.5)
  • Revision ID: package-import@ubuntu.com-20140225223143-odhqxfc60wxrjl15
Tags: 2.0.0~rc1+dfsg-0ubuntu1
https://launchpad.net/bugs/1294823
https://launchpad.net/bugs/1295072
* Merge 2.0.0-rc1
* debian/rules: consolidate ppc filter entries.
* Move qemu-system-arch64 into qemu-system-arm
* debian/patches/define-trusty-machine-type.patch: define a trusty machine
  type, currently the same as pc-i440fx-2.0, to put is in a better position
  to enable live migrations from trusty onward.  (LP: #1294823)
* debian/control: build-dep on libfdt >= 1.4.0  (LP: #1295072)
* Merge latest upstream git to commit dc9528f
* Debian/rules:
  - remove -enable-uname-release=2.6.32
  - don't make the aarch64 target Ubuntu-specific.
* Remove patches which are now upstream:
  - fix-smb-security-share.patch
  - slirp-smb-redirect-port-445-too.patch 
  - linux-user-Implement-sendmmsg-syscall.patch (better version is upstream)
  - signal-added-a-wrapper-for-sigprocmask-function.patch
  - ubuntu/signal-sigsegv-protection-on-do_sigprocmask.patch
  - ubuntu/Don-t-block-SIGSEGV-at-more-places.patch
  - ubuntu/ppc-force-cpu-threads-count-to-be-power-of-2.patch
* add link for /usr/share/qemu/bios-256k.bin
* Remove all linaro patches.
* Remove all arm64/ patches.  Many but not all are upstream.
* Remove CVE-2013-4377.patch which is upstream.
* debian/control-in: don't make qemu-system-aarch64 ubuntu-specific

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.objs
19
19
block-obj-y += qemu-coroutine-sleep.o
20
20
block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o
21
21
 
22
 
ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
23
 
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
24
 
# only pull in the actual virtio-9p device if we also enabled virtio.
25
 
CONFIG_REALLY_VIRTFS=y
26
 
endif
 
22
block-obj-m = block/
 
23
 
27
24
 
28
25
######################################################################
29
26
# smartcard
41
38
# single QEMU executable should support all CPUs and machines.
42
39
 
43
40
ifeq ($(CONFIG_SOFTMMU),y)
44
 
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
 
41
common-obj-y = blockdev.o blockdev-nbd.o block/
 
42
common-obj-y += iothread.o
45
43
common-obj-y += net/
46
 
common-obj-y += readline.o
47
44
common-obj-y += qdev-monitor.o device-hotplug.o
48
45
common-obj-$(CONFIG_WIN32) += os-win32.o
49
46
common-obj-$(CONFIG_POSIX) += os-posix.o
51
48
common-obj-$(CONFIG_LINUX) += fsdev/
52
49
 
53
50
common-obj-y += migration.o migration-tcp.o
 
51
common-obj-y += vmstate.o
 
52
common-obj-y += qemu-file.o
54
53
common-obj-$(CONFIG_RDMA) += migration-rdma.o
55
54
common-obj-y += qemu-char.o #aio.o
56
55
common-obj-y += block-migration.o
110
109
# by libqemuutil.a.  These should be moved to a separate .json schema.
111
110
qga-obj-y = qga/ qapi-types.o qapi-visit.o
112
111
qga-vss-dll-obj-y = qga/
113
 
 
114
 
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
115
 
 
116
 
vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
117
 
 
118
 
QEMU_CFLAGS+=$(GLIB_CFLAGS)
119
 
 
120
 
nested-vars += \
121
 
        stub-obj-y \
122
 
        util-obj-y \
123
 
        qga-obj-y \
124
 
        qga-vss-dll-obj-y \
125
 
        block-obj-y \
126
 
        common-obj-y
127
 
dummy := $(call unnest-vars)