aboutsummaryrefslogtreecommitdiffstats
path: root/tools/vnet/vnet-module
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-04-27 16:27:07 +0100
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-04-27 16:27:07 +0100
commit56c09b24436d71dd62fc590fa77fe3c0a98c9470 (patch)
tree704b23cf7648b972b4b6862d86cc8941da9b0060 /tools/vnet/vnet-module
parent96a333869fe43e866a84e878feae97a5bc69af55 (diff)
downloadxen-56c09b24436d71dd62fc590fa77fe3c0a98c9470.tar.gz
xen-56c09b24436d71dd62fc590fa77fe3c0a98c9470.tar.bz2
xen-56c09b24436d71dd62fc590fa77fe3c0a98c9470.zip
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@solid-soft.at>
Diffstat (limited to 'tools/vnet/vnet-module')
-rw-r--r--tools/vnet/vnet-module/Makefile.ver14
-rw-r--r--tools/vnet/vnet-module/varp.c5
-rw-r--r--tools/vnet/vnet-module/vnet.c5
3 files changed, 10 insertions, 14 deletions
diff --git a/tools/vnet/vnet-module/Makefile.ver b/tools/vnet/vnet-module/Makefile.ver
index 2567f9242f..76382c2a32 100644
--- a/tools/vnet/vnet-module/Makefile.ver
+++ b/tools/vnet/vnet-module/Makefile.ver
@@ -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 --git a/tools/vnet/vnet-module/varp.c b/tools/vnet/vnet-module/varp.c
index 94c2f7569b..aefbd43d43 100644
--- a/tools/vnet/vnet-module/varp.c
+++ b/tools/vnet/vnet-module/varp.c
@@ -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 --git a/tools/vnet/vnet-module/vnet.c b/tools/vnet/vnet-module/vnet.c
index 23855d5399..51796415cc 100644
--- a/tools/vnet/vnet-module/vnet.c
+++ b/tools/vnet/vnet-module/vnet.c
@@ -693,12 +693,7 @@ module_init(vnet_module_init);
module_exit(vnet_module_exit);
MODULE_LICENSE("GPL");
-#ifdef MODULE_PARM
-MODULE_PARM(vnet_encaps, "s");
-#else
module_param(vnet_encaps, charp, 0644);
-#endif
-
MODULE_PARM_DESC(vnet_encaps, "Vnet encapsulation: etherip or udp.");
#endif