[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, bpo-squeeze, updated. debian/0.9.11-2-17-g8a2008d

[Guido Günther]

The following commit has been merged in the bpo-squeeze branch:
commit 31a43dd0740c646f8f30e17c0363fc7fba2341df
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Apr 17 14:44:57 2012 +0200

    Disable macvtap on Squeeze since it's kernel are too old
    
    to compile it.

diff --git a/debian/control b/debian/control
index de7af8a..f9ab41d 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Build-Depends: cdbs (>= 0.4.89~),
  libyajl-dev,
  libpcap0.8-dev,
  libnuma-dev [amd64 i386 ia64 mips mipsel powerpc],
+ lsb-release,
  radvd [linux-any],
  libnetcf-dev [linux-any],
 # For "make check"
diff --git a/debian/rules b/debian/rules
index 521701d..a70ab25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+DISTREL := $(shell lsb_release -cs)
+
 ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
   WITH_XEN = --with-xen
   WITH_VBOX = --with-vbox
@@ -53,6 +55,11 @@ else
   WITH_NETCF          = --without-netcf
 endif
 
+ifeq "$(DISTREL)" "squeeze"
+    # Squeeze's kernel headers are too old to compile macvtap
+    WITH_MACVTAP    = --without-macvtap
+endif
+
 DEB_BUILDDIR := $(CURDIR)/debian/build
 DEB_CONFIGURE_EXTRA_FLAGS :=     \
 	--disable-rpath          \

-- 
Libvirt Debian packaging