WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] vnet: Fix build of the vnet module.

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] vnet: Fix build of the vnet module.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 27 Apr 2007 14:40:13 -0700
Delivery-date: Fri, 27 Apr 2007 14:39:23 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1177687627 -3600
# Node ID aedc55daf92b1056c25e24482ba130913b86b867
# Parent  493f7c689f03cda9796b3e1df761dd0e1a2a31eb
vnet: Fix build of the vnet module.
- correcting KERNEL_SRC ( ./build-linux... )
- typing errors in Makefile.ver
- module-params
Signed-off-by: Robert Valentan <R.Valentan@xxxxxxxxxxxxx>
---
 tools/vnet/vnet-module/Makefile.ver |   14 ++++++++++----
 tools/vnet/vnet-module/varp.c       |    5 -----
 tools/vnet/vnet-module/vnet.c       |    9 ++-------
 tools/vnet/vnetd/Makefile           |    4 +++-
 tools/vnet/vnetd/sys_kernel.h       |    1 +
 5 files changed, 16 insertions(+), 17 deletions(-)

diff -r 493f7c689f03 -r aedc55daf92b tools/vnet/vnet-module/Makefile.ver
--- a/tools/vnet/vnet-module/Makefile.ver       Fri Apr 27 16:21:20 2007 +0100
+++ b/tools/vnet/vnet-module/Makefile.ver       Fri Apr 27 16:27:07 2007 +0100
@@ -18,8 +18,14 @@
 # 59 Temple Place, suite 330, Boston, MA 02111-1307 USA
 #============================================================================
 
+include $(XEN_ROOT)/Config.mk
+
 LINUX_SERIES?=2.6
-KERNEL_MINOR=-xen
+ifeq ($(XEN_SPLIT_KERNEL),y)
+  KERNEL_MINOR=-xen0
+else
+  KERNEL_MINOR=-xen
+endif
 
 LINUX_VERSION?=$(shell (/bin/ls -d 
$(XEN_ROOT)/pristine-linux-$(LINUX_SERIES).* 2>/dev/null) | \
                       sed -e 's!^.*linux-\(.\+\)!\1!' )
@@ -30,7 +36,7 @@ endif
 
 KERNEL_VERSION=$(LINUX_VERSION)$(KERNEL_MINOR)
 
-KERNEL_SRC?=$(shell cd $(XEN_ROOT)/linux-$(KERNEL_VERSION) && pwd)
+KERNEL_SRC ?= $(shell cd 
$(XEN_ROOT)/build-linux-$(KERNEL_VERSION)_$(XEN_TARGET_ARCH) && pwd)
 
 ifeq ($(KERNEL_SRC),)
 $(error Kernel source for kernel $(KERNEL_VERSION) not found)
@@ -40,10 +46,10 @@ endif
 # may not have the extraversion, e.g. linux-2.6.12-xen0 may contain release 
2.6.12.6-xen0.
 KERNEL_RELEASE=$(shell make -s -C $(KERNEL_SRC) kernelrelease)
 
-KERNEL_MODULE_DIR=/lib/modules/$$(KERNEL_RELEASE)/kernel
+KERNEL_MODULE_DIR=/lib/modules/$(KERNEL_RELEASE)/kernel
 
 $(warning KERNEL_SRC           $(KERNEL_SRC))
 $(warning LINUX_VERSION                $(LINUX_VERSION))
 $(warning KERNEL_VERSION       $(KERNEL_VERSION))
 $(warning KERNEL_RELEASE       $(KERNEL_RELEASE))
-$(warning KERNEL_ MODULE_DIR   $(KERNEL_MODULE_DIR))
+$(warning KERNEL_MODULE_DIR    $(KERNEL_MODULE_DIR))
diff -r 493f7c689f03 -r aedc55daf92b tools/vnet/vnet-module/varp.c
--- a/tools/vnet/vnet-module/varp.c     Fri Apr 27 16:21:20 2007 +0100
+++ b/tools/vnet/vnet-module/varp.c     Fri Apr 27 16:27:07 2007 +0100
@@ -1530,12 +1530,7 @@ void varp_exit(void){
     dprintf("<\n");
 }
 
-#ifdef MODULE_PARM
-MODULE_PARM(varp_mcaddr, "s");
-MODULE_PARM(varp_device, "s");
-#else
 module_param(varp_mcaddr, charp, 0644);
 module_param(varp_device, charp, 0644);
-#endif
 MODULE_PARM_DESC(varp_mcaddr, "VARP multicast address");
 MODULE_PARM_DESC(varp_device, "VARP network device");
diff -r 493f7c689f03 -r aedc55daf92b tools/vnet/vnet-module/vnet.c
--- a/tools/vnet/vnet-module/vnet.c     Fri Apr 27 16:21:20 2007 +0100
+++ b/tools/vnet/vnet-module/vnet.c     Fri Apr 27 16:27:07 2007 +0100
@@ -693,12 +693,7 @@ module_exit(vnet_module_exit);
 module_exit(vnet_module_exit);
 MODULE_LICENSE("GPL");
 
-#ifdef MODULE_PARM
-MODULE_PARM(vnet_encaps, "s");
-#else
 module_param(vnet_encaps, charp, 0644);
+MODULE_PARM_DESC(vnet_encaps, "Vnet encapsulation: etherip or udp.");
+
 #endif
-
-MODULE_PARM_DESC(vnet_encaps, "Vnet encapsulation: etherip or udp.");
-
-#endif
diff -r 493f7c689f03 -r aedc55daf92b tools/vnet/vnetd/Makefile
--- a/tools/vnet/vnetd/Makefile Fri Apr 27 16:21:20 2007 +0100
+++ b/tools/vnet/vnetd/Makefile Fri Apr 27 16:27:07 2007 +0100
@@ -16,7 +16,7 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #----------------------------------------------------------------------------
 
-VNET_ROOT = $(shell cd .. && pwd)
+VNET_ROOT ?= $(shell cd .. && pwd)
 include $(VNET_ROOT)/Make.env
 
 .PHONY: all
@@ -26,6 +26,8 @@ all: vnetd
 
 # Comment out when outside xen.
 #include $(XEN_ROOT)/tools/Rules.mk
+
+INSTALL_PROG ?= $(INSTALL) -m0755 -p
 
 VNETD_INSTALL_DIR = /usr/sbin
 
diff -r 493f7c689f03 -r aedc55daf92b tools/vnet/vnetd/sys_kernel.h
--- a/tools/vnet/vnetd/sys_kernel.h     Fri Apr 27 16:21:20 2007 +0100
+++ b/tools/vnet/vnetd/sys_kernel.h     Fri Apr 27 16:27:07 2007 +0100
@@ -45,6 +45,7 @@
 #define module_exit(x)
 #define MODULE_LICENSE(x)
 #define MODULE_PARM(v, t)
+#define module_param(v, t, s)
 #define MODULE_PARM_DESC(v, s)
 
 enum {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] vnet: Fix build of the vnet module., Xen patchbot-unstable <=