[xen-unstable] vnet: Fix compilation.

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen-unstable] vnet: Fix compilation.

Xen patchbot-unstable
# HG changeset patch
# User Keir Fraser <[hidden email]>
# Date 1196762640 0
# Node ID f54b2dd57037df7cb610b05c754b9479ab5d7108
# Parent  8e3d42fdb8e784b947fbd998d9a6df0ebf771718
vnet: Fix compilation.
Signed-off-by: Samuel Thibault <[hidden email]>
---
 tools/vnet/libxutil/Makefile        |    2 +-
 tools/vnet/vnet-module/Makefile.ver |    6 +++---
 tools/vnet/vnet-module/sa.c         |    1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff -r 8e3d42fdb8e7 -r f54b2dd57037 tools/vnet/libxutil/Makefile
--- a/tools/vnet/libxutil/Makefile Tue Dec 04 09:56:10 2007 +0000
+++ b/tools/vnet/libxutil/Makefile Tue Dec 04 10:04:00 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 8e3d42fdb8e7 -r f54b2dd57037 tools/vnet/vnet-module/Makefile.ver
--- a/tools/vnet/vnet-module/Makefile.ver Tue Dec 04 09:56:10 2007 +0000
+++ b/tools/vnet/vnet-module/Makefile.ver Tue Dec 04 10:04:00 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 8e3d42fdb8e7 -r f54b2dd57037 tools/vnet/vnet-module/sa.c
--- a/tools/vnet/vnet-module/sa.c Tue Dec 04 09:56:10 2007 +0000
+++ b/tools/vnet/vnet-module/sa.c Tue Dec 04 10:04:00 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-changelog mailing list
[hidden email]
http://lists.xensource.com/xen-changelog