Ubuntu
qemu-linaro package

Merge lp:~serge-hallyn/ubuntu/precise/qemu-linaro/merge-spice into lp:ubuntu/precise/qemu-linaro

  1. Precise (12.04)
  2. merge-spice
  3. Merge into precise
Proposed by Serge Hallyn
Status: Merged
Merged at revision: 12887
Proposed branch: lp:~serge-hallyn/ubuntu/precise/qemu-linaro/merge-spice
Merge into: lp:ubuntu/precise/qemu-linaro
Diff against target: 128 lines (+64/-1)
5 files modified
debian/changelog (+14/-0)
debian/control (+8/-0)
debian/qemu-kvm-spice.install (+4/-0)
debian/qemu-kvm-spice.links (+1/-0)
debian/rules (+37/-1)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/precise/qemu-linaro/merge-spice
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+84212@code.launchpad.net
To post a comment you must log in.

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-10-28 17:37:34 +0000
3+++ debian/changelog 2011-12-02 06:03:24 +0000
4@@ -1,3 +1,17 @@
5+qemu-linaro (0.15.50-2011.10-0ubuntu2) precise; urgency=low
6+
7+ * Add qemu-kvm-spice package
8+ - debian/control: add libspice-protocol-dev and libspice-server-dev
9+ to build-depends, define the qemu-kvm-spice package,
10+ remove all other packages, and rename source package to qemu-kvm.
11+ - debian/rules:
12+ * keep only spice-enabled binaries
13+ * rename our binaries to '-spice'
14+ - debian/qemu-kvm-spice.links and debian/qemu-kvm-spice.install: install
15+ kvm-spice and qemu-system-x86_64-spice
16+
17+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Tue, 29 Nov 2011 15:29:46 -0600
18+
19 qemu-linaro (0.15.50-2011.10-0ubuntu1) precise; urgency=low
20
21 * New upstream release.
22
23=== modified file 'debian/control'
24--- debian/control 2011-05-18 17:02:15 +0000
25+++ debian/control 2011-12-02 06:03:24 +0000
26@@ -16,6 +16,8 @@
27 libcurl4-gnutls-dev,
28 libgnutls-dev,
29 libsasl2-dev,
30+ libspice-protocol-dev [i386 amd64],
31+ libspice-server-dev [i386 amd64],
32 uuid-dev,
33 libvdeplug2-dev [!kfreebsd-any],
34 libbluetooth-dev [!kfreebsd-any],
35@@ -116,3 +118,9 @@
36 This is a transitional package depending on the static user mode emulation
37 binaries. You can remove it once the upgrade is complete and nothing
38 depends on it.
39+
40+Package: qemu-kvm-spice
41+Architecture: i386 amd64
42+Depends: qemu-kvm, ${misc:Depends}, ${shlibs:Depends}, libspice-server1
43+Description: Full virtualization on i386 and amd64 hardware
44+ This adds versions of qemu-kvm which can use SPICE, called qemu-kvm-spice.
45
46=== added file 'debian/qemu-kvm-spice.install'
47--- debian/qemu-kvm-spice.install 1970-01-01 00:00:00 +0000
48+++ debian/qemu-kvm-spice.install 2011-12-02 06:03:24 +0000
49@@ -0,0 +1,4 @@
50+usr/bin/qemu-spice
51+usr/bin/qemu-i386-spice
52+usr/bin/qemu-x86_64-spice
53+usr/bin/qemu-system-x86_64-spice
54
55=== added file 'debian/qemu-kvm-spice.links'
56--- debian/qemu-kvm-spice.links 1970-01-01 00:00:00 +0000
57+++ debian/qemu-kvm-spice.links 2011-12-02 06:03:24 +0000
58@@ -0,0 +1,1 @@
59+usr/bin/qemu-system-x86_64-spice usr/bin/kvm-spice
60
61=== modified file 'debian/rules'
62--- debian/rules 2011-10-28 17:37:27 +0000
63+++ debian/rules 2011-12-02 06:03:24 +0000
64@@ -142,6 +142,24 @@
65 --disable-system \
66 --static \
67 $(conf_arch)
68+
69+ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
70+ # spice build
71+ mkdir -p $(CURDIR)/spice-build
72+ cd $(CURDIR)/spice-build && \
73+ ../configure \
74+ --with-pkgversion="Debian $(deb_version)" \
75+ --extra-cflags="$(CFLAGS)" \
76+ --extra-ldflags="$(LDFLAGS)" \
77+ --prefix=/usr \
78+ --interp-prefix=/etc/qemu-binfmt/%M \
79+ --disable-blobs \
80+ --disable-strip \
81+ --disable-system \
82+ --target-list="x86_64-softmmu i386-softmmu x86_64-linux-user i386-linux-user" \
83+ --enable-spice \
84+ $(conf_arch)
85+endif
86 endif
87
88 override_dh_auto_build:
89@@ -153,6 +171,11 @@
90
91 # static user build
92 dh_auto_build -B user-static-build
93+
94+ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
95+ # spice build
96+ dh_auto_build -B spice-build
97+endif
98 endif
99
100 override_dh_auto_install:
101@@ -172,13 +195,26 @@
102 $(CURDIR)/debian/qemu-user-static/usr/share/binfmts ; \
103 done
104 f=debian/qemu-user-static.sysctl; [ -f debian/qemu-user-static.sysctl.$(DEB_BUILD_ARCH) ] && f=debian/qemu-user-static.sysctl.$(DEB_BUILD_ARCH); cp $$f debian/qemu-user-static/etc/sysctl.d/30-qemu-user-static.conf
105+ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
106+ dh_auto_install -B spice-build --destdir=$(CURDIR)/debian/spice-tmp
107+ for target in qemu qemu-i386 qemu-x86_64 qemu-system-x86_64; do \
108+ mv $(CURDIR)/debian/spice-tmp/usr/bin/$$target \
109+ $(CURDIR)/debian/spice-tmp/usr/bin/$$target-spice; \
110+ done
111+endif
112 endif
113 dh_auto_install -B system-build --destdir=$(CURDIR)/debian/tmp
114 mv $(CURDIR)/debian/tmp/usr/share/man/man1/qemu.1 \
115 $(CURDIR)/debian/tmp/usr/share/man/man1/qemu-system.1
116
117+override_dh_install:
118+ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
119+ dh_install -pqemu-kvm-spice --sourcedir=$(CURDIR)/debian/spice-tmp
120+endif
121+ dh_install -Nqemu-kvm-spice
122+
123 override_dh_auto_clean:
124- rm -rf user-static-build user-build system-build
125+ rm -rf user-static-build user-build system-build spice-build
126
127 override_dh_auto_test:
128 # tests are broken ATM

Subscribers

People subscribed via source and target branches

to all changes: