vnet: Fix compilation.

Signed-off-by: Samuel Thibault <samuel.thibault@citrix.com>

diff --git a/tools/vnet/libxutil/Makefile b/tools/vnet/libxutil/Makefile
index 0e790c58319f3af1a7e2f047f6eb0d3a459d457f..3d490f097187f56ffadfafb81e16e870e92266c8 100644 (file)
--- a/tools/vnet/libxutil/Makefile
+++ b/tools/vnet/libxutil/Makefile
@@ -24,7 +24,7 @@ LIB_SRCS += util.c
 LIB_OBJS := $(LIB_SRCS:.c=.o)
 PIC_OBJS := $(LIB_SRCS:.c=.opic)
 
-CFLAGS   += -Werror -fno-strict-aliasing
+CFLAGS   += -Werror -fno-strict-aliasing $(call cc-option,$(CC),-fgnu89-inline,)
 CFLAGS   += -O3
 #CFLAGS   += -g
 

diff --git a/tools/vnet/vnet-module/Makefile.ver b/tools/vnet/vnet-module/Makefile.ver
index dcd6e0f736544868cb909ea987650d9f733ea156..14dd722bb7eac8891f08675231c4cb191793e414 100644 (file)
--- a/tools/vnet/vnet-module/Makefile.ver
+++ b/tools/vnet/vnet-module/Makefile.ver
@@ -20,14 +20,14 @@
 
 LINUX_SERIES?=2.6
 
-LINUX_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/pristine-linux-$(LINUX_SERIES).* 2>/dev/null) | \
-                      sed -e 's!^.*linux-\(.\+\)!\1!' )
+LINUX_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/linux-$(LINUX_SERIES).* 2>/dev/null) | \
+                      sed -e 's!^.*linux-\(.\+\).hg!\1!' )
 
 ifeq ($(LINUX_VERSION),)
 $(error Kernel source for linux $(LINUX_SERIES) not found)
 endif
 
-KERNEL_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/build-linux-$(LINUX_VERSION)-xen* 2>/dev/null) | \
+KERNEL_VERSION?=$(shell (/bin/ls -d $(XEN_ROOT)/build-linux-$(LINUX_VERSION)* 2>/dev/null) | \
                       grep -v -m 1 -e '-xenU' | \
                       sed -e 's!^.*linux-\(.\+\)!\1!' )
 

diff --git a/tools/vnet/vnet-module/sa.c b/tools/vnet/vnet-module/sa.c
index df3f4edc5adf82b70c31a1311ec01d46ef001695..a3505ed97d10c9786be357d481679aa8f8e1d37c 100644 (file)
--- a/tools/vnet/vnet-module/sa.c
+++ b/tools/vnet/vnet-module/sa.c
@@ -16,7 +16,6 @@
  * 59 Temple Place, suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
 
 #include <tunnel.h>