summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2012-10-25 12:55:40 +0300
committerRiku Voipio <riku.voipio@linaro.org>2012-10-25 12:55:40 +0300
commitebbe15f895f7e00b7dbb170f45f3a3ed32022c60 (patch)
tree224a1a4becd782d16fcf03ea42c52eeec6270133
parent56a8e17c9a3c677d0d0c2ec7b8d00dacbfe907e6 (diff)
remove spice, not needed for linaro builds
-rw-r--r--control7
-rwxr-xr-xrules8
2 files changed, 4 insertions, 11 deletions
diff --git a/control b/control
index 7df25ab..1640f49 100644
--- a/control
+++ b/control
@@ -16,8 +16,6 @@ Build-Depends: debhelper (>= 7.0.50~),
libcurl4-gnutls-dev,
libgnutls-dev,
libsasl2-dev,
- libspice-protocol-dev [amd64],
- libspice-server-dev [amd64],
uuid-dev,
libvdeplug2-dev [!kfreebsd-any],
libbluetooth-dev [!kfreebsd-any],
@@ -119,8 +117,3 @@ Description: QEMU static user mode emulation binaries (transitional package)
binaries. You can remove it once the upgrade is complete and nothing
depends on it.
-Package: qemu-kvm-spice
-Architecture: amd64
-Depends: qemu-kvm, ${misc:Depends}, ${shlibs:Depends}, libspice-server1
-Description: Full virtualization on amd64 hardware
- This adds versions of qemu-kvm which can use SPICE, called qemu-kvm-spice.
diff --git a/rules b/rules
index 3037a48..8927fc8 100755
--- a/rules
+++ b/rules
@@ -149,7 +149,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
--enable-uname-release=2.6.32 \
$(conf_arch)
-ifeq ($(DEB_HOST_ARCH),amd64)
+ifeq ($(DEB_HOST_ARCH),disabled)
# spice build
mkdir -p $(CURDIR)/spice-build
cd $(CURDIR)/spice-build && \
@@ -178,7 +178,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
# static user build
dh_auto_build -B user-static-build --parallel
-ifeq ($(DEB_HOST_ARCH),amd64)
+ifeq ($(DEB_HOST_ARCH),disabled)
# spice build
dh_auto_build -B spice-build --parallel
endif
@@ -201,7 +201,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
$(CURDIR)/debian/qemu-user-static/usr/share/binfmts ; \
done
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
-ifeq ($(DEB_HOST_ARCH),amd64)
+ifeq ($(DEB_HOST_ARCH),disabled)
dh_auto_install -B spice-build --destdir=$(CURDIR)/debian/spice-tmp
for target in qemu-i386 qemu-x86_64 qemu-system-x86_64; do \
mv $(CURDIR)/debian/spice-tmp/usr/bin/$$target \
@@ -216,7 +216,7 @@ endif
$(CURDIR)/debian/tmp/usr/share/man/man1/qemu-system.1
override_dh_install:
-ifeq ($(DEB_HOST_ARCH),amd64)
+ifeq ($(DEB_HOST_ARCH),disabled)
dh_install -pqemu-kvm-spice --sourcedir=$(CURDIR)/debian/spice-tmp
endif
dh_install -Nqemu-kvm-spice