Merge lp:~serge-hallyn/ubuntu/natty/qemu-kvm/bug-693341 into lp:ubuntu/natty/qemu-kvm

Proposed by Serge Hallyn
Status: Needs review
Proposed branch: lp:~serge-hallyn/ubuntu/natty/qemu-kvm/bug-693341
Merge into: lp:ubuntu/natty/qemu-kvm
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/natty/qemu-kvm/bug-693341
Reviewer Review Type Date Requested Status
Dustin Kirkland  Approve
Review via email: mp+48994@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) wrote :

Looks good to me. Will sponsor/upload.

review: Approve

Unmerged revisions

109. By Serge Hallyn

Pass -fno-var-tracking on armel to hopefully reduce memory consumption.
(LP: #693341)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-01-30 20:24:53 +0000
3+++ debian/changelog 2011-02-08 22:09:54 +0000
4@@ -1,3 +1,10 @@
5+qemu-kvm (0.13.0+noroms-0ubuntu14) natty; urgency=low
6+
7+ * Pass -fno-var-tracking on armel to hopefully reduce memory consumption.
8+ (LP: #693341)
9+
10+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Tue, 08 Feb 2011 14:41:39 -0600
11+
12 qemu-kvm (0.13.0+noroms-0ubuntu13) UNRELEASED; urgency=low
13
14 * Rename qemu-user manpage to qemu-kvm so that qemu-linaro can take over
15
16=== modified file 'debian/rules'
17--- debian/rules 2010-12-06 19:36:07 +0000
18+++ debian/rules 2011-02-08 22:09:54 +0000
19@@ -46,6 +46,7 @@
20 endif
21 ifneq (,$(findstring $(DEB_HOST_ARCH), arm armel))
22 BINFMT_TARGETS := $(filter-out arm, $(ALL_BINFMT_TARGETS))
23+CFLAGS += -fno-var-tracking
24 endif
25 ifeq ($(DEB_HOST_ARCH),i386)
26 BINFMT_TARGETS := $(filter-out i386, $(ALL_BINFMT_TARGETS))

Subscribers

People subscribed via source and target branches

to all changes: