fix build

Imported the qemu-kvm sources into the git repository now.

diff --git a/Makefile b/Makefile
index d93e9a0e2627f8513086f33f8593f5a66fd82029..bbd43febbf85bdb75f9a3f653e362ee755fe48dd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,29 +2,29 @@ RELEASE=2.0
 
 # also update debian/changelog
 KVMVER=1.0
-KVMPKGREL=2
+KVMPKGREL=3
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
+KVMSRC=${KVMDIR}-src.tar.gz
 
 ARCH=amd64
 
 KVM_DEB=${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
 
-all: ${KVM_DEB} ${KVMDIR}-src.tar.gz
+all: ${KVM_DEB} ${KVMSRC}
 
-${KVMDIR}.org/README:
-       rm -rf ${KVMDIR}.org
-       git clone git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git ${KVMDIR}.org
-       # cd ${KVMDIR}.org; git checkout -b local qemu-kvm-${KVMVER}
-       touch $@
+.PHONY: download
+download:
+       rm -rf ${KVMDIR} ${KVMSRC}
+       git clone git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git ${KVMDIR}
+       # fixme checkout correct version
+       # cd ${KVMDIR}; git checkout -b local qemu-kvm-${KVMVER}
+       tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
-${KVMDIR}-src.tar.gz: ${KVMDIR}.org/README
-       tar czf $@ ${KVMDIR}.org
-
-${KVM_DEB} kvm: ${KVMDIR}.org/README
+${KVM_DEB} kvm: ${KVMSRC}
        rm -rf ${KVMDIR}
-       cp -a ${KVMDIR}.org ${KVMDIR}
+       tar xf ${KVMSRC} 
        cp -a debian ${KVMDIR}/debian
        cd ${KVMDIR}; dpkg-buildpackage -rfakeroot -us -uc
        lintian ${KVM_DEB} || true
@@ -33,18 +33,14 @@ ${KVM_DEB} kvm: ${KVMDIR}.org/README
 upload: ${KVM_DEB} ${KVMDIR}-src.tar.gz
        umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
        mkdir -p /pve/${RELEASE}/extra
-       mkdir -p /pve/${RELEASE}/install
        rm -rf /pve/${RELEASE}/extra/Packages*
        rm -rf /pve/${RELEASE}/extra/${KVMPACKAGE}_*.deb
-       rm -rf /pve/${RELEASE}/install/${KVMDIR}-src.tar.gz
        cp ${KVM_DEB} /pve/${RELEASE}/extra
-       cp  ${KVMDIR}-src.tar.gz /pve/${RELEASE}/install
        cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
        umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
 
 .PHONY: distclean
 distclean: clean
-       rm -rf ${KVMDIR}.org ${KVMDIR}-src.tar.gz
 
 
 .PHONY: clean

diff --git a/debian/changelog b/debian/changelog
index ec3cd06b77c9bfd5d330592a33a8342a52fa4717..7d52cc9ade4f930406340b3db0a52bc13ac4c9dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-qemu-kvm (1.0-3) unstable; urgency=low
+
+  * include latest updates from master
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 15 Feb 2012 11:32:23 +0100
+
 pve-qemu-kvm (1.0-2) unstable; urgency=low
 
   * include post 1.0 changes from master

diff --git a/debian/patches/adjust-path.diff b/debian/patches/adjust-path.diff
index 59c6305675204ad3506f0a0678f829cdee0be29a..e4bddf6c6c9d4a33b30c01af46e3cf6cd005805f 100644 (file)
--- a/debian/patches/adjust-path.diff
+++ b/debian/patches/adjust-path.diff
@@ -1,8 +1,8 @@
 Index: new/net.h
 ===================================================================
---- new.orig/net.h     2012-02-09 13:22:23.000000000 +0100
-+++ new/net.h  2012-02-09 13:22:30.000000000 +0100
-@@ -172,8 +172,8 @@
+--- new.orig/net.h     2012-02-15 11:17:27.000000000 +0100
++++ new/net.h  2012-02-15 11:29:29.000000000 +0100
+@@ -173,8 +173,9 @@
  int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
  int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
  
@@ -10,14 +10,15 @@ Index: new/net.h
 -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
 +#define DEFAULT_NETWORK_SCRIPT "/etc/kvm/kvm-ifup"
 +#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/kvm/kvm-ifdown"
- 
- void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
++
+ #define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
+ #define DEFAULT_BRIDGE_INTERFACE "br0"
  
 Index: new/configure
 ===================================================================
---- new.orig/configure 2012-02-09 13:22:23.000000000 +0100
-+++ new/configure      2012-02-09 13:22:30.000000000 +0100
-@@ -166,7 +166,7 @@
+--- new.orig/configure 2012-02-15 11:17:27.000000000 +0100
++++ new/configure      2012-02-15 11:21:15.000000000 +0100
+@@ -167,7 +167,7 @@
  libdir="\${prefix}/lib"
  includedir="\${prefix}/include"
  sysconfdir="\${prefix}/etc"
@@ -28,8 +29,8 @@ Index: new/configure
  fmod_inc=""
 Index: new/net/tap.h
 ===================================================================
---- new.orig/net/tap.h 2012-02-09 13:22:23.000000000 +0100
-+++ new/net/tap.h      2012-02-09 13:22:30.000000000 +0100
+--- new.orig/net/tap.h 2012-02-15 11:17:27.000000000 +0100
++++ new/net/tap.h      2012-02-15 11:21:15.000000000 +0100
 @@ -29,8 +29,6 @@
  #include "qemu-common.h"
  #include "qemu-option.h"

diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
new file mode 100644 (file)
index 0000000..a7c32f4
Binary files /dev/null and b/qemu-kvm-src.tar.gz differ