Update vnet compilation.
Signed-off-by: Samuel Thibault <samuel.thibault@citrix.com>
diff -r 6fd17d0dcbcd tools/vnet/libxutil/Makefile
--- a/tools/vnet/libxutil/Makefile Tue Nov 27 12:49:16 2007 +0000
+++ b/tools/vnet/libxutil/Makefile Tue Nov 27 16:31:55 2007 +0000
@@ -24,7 +24,7 @@ LIB_OBJS := $(LIB_SRCS:.c=.o)
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 -r 6fd17d0dcbcd tools/vnet/vnet-module/Makefile.ver
--- a/tools/vnet/vnet-module/Makefile.ver Tue Nov 27 12:49:16 2007 +0000
+++ b/tools/vnet/vnet-module/Makefile.ver Tue Nov 27 16:31:55 2007 +0000
@@ -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 -r 6fd17d0dcbcd tools/vnet/vnet-module/sa.c
--- a/tools/vnet/vnet-module/sa.c Tue Nov 27 12:49:16 2007 +0000
+++ b/tools/vnet/vnet-module/sa.c Tue Nov 27 16:31:55 2007 +0000
@@ -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>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel