Keir Fraser schrieb:
> On 27/4/07 16:26, "Robert Valentan" <R.Valentan@xxxxxxxxxxxxx> wrote:
>
>> This patch add's a XEN_SPLIT_KERNEL to Config.mk and use it
>> in config/Linux.mk
>> This patch is also needed for my vnet-patch (some minutes before)
>> to get the kernel_src dir.
>>
>> Signed-off-by: Robert Valentan <R.Valentan@xxxxxxxxxxxxx>
>
> Can't you just do some grep hack on the KERNELS variable in the vnet
> Makefile? I think it's enough that KERNELS can be overridden -- we don't
> need yet another top-level config option.
Attached the modified patch.
Signed-off-by: Robert Valentan <R.Valentan@xxxxxxxxxxxxx>
--
Robert Valentan
diff -r ee16cdeddade tools/vnet/vnet-module/00README
--- a/tools/vnet/vnet-module/00README Wed Apr 25 09:39:08 2007
+++ b/tools/vnet/vnet-module/00README Fri Apr 27 22:19:39 2007
@@ -9,8 +9,8 @@
LINUX_SERIES: linux release to compile for: 2.4, or 2.6 (default).
XEN_ROOT: root of the xen tree containing kernel source.
KERNEL_VERSION: kernel version, default got from XEN_ROOT.
-KERNEL_MINOR: kernel minor version, default -xen0.
-KERNEL_SRC: path to kernel source, default linux-<VERSION> under XEN_ROOT.
+KERNEL_SRC: path to kernel source, default build-linux-<VERSION>
+ under XEN_ROOT.
*) For 2.4 kernel
diff -r ee16cdeddade tools/vnet/vnet-module/Makefile.ver
--- a/tools/vnet/vnet-module/Makefile.ver Wed Apr 25 09:39:08 2007
+++ b/tools/vnet/vnet-module/Makefile.ver Fri Apr 27 22:19:39 2007
@@ -19,7 +19,6 @@
#============================================================================
LINUX_SERIES?=2.6
-KERNEL_MINOR=-xen
LINUX_VERSION?=$(shell (/bin/ls -d
$(XEN_ROOT)/pristine-linux-$(LINUX_SERIES).* 2>/dev/null) | \
sed -e 's!^.*linux-\(.\+\)!\1!' )
@@ -28,22 +27,25 @@
$(error Kernel source for linux $(LINUX_SERIES) not found)
endif
-KERNEL_VERSION=$(LINUX_VERSION)$(KERNEL_MINOR)
+KERNEL_VERSION?=$(shell (/bin/ls -d
$(XEN_ROOT)/build-linux-$(LINUX_VERSION)-xen* 2>/dev/null) | \
+ grep -v -m 1 -e '-xenU' | \
+ sed -e 's!^.*linux-\(.\+\)!\1!' )
-KERNEL_SRC?=$(shell cd $(XEN_ROOT)/linux-$(KERNEL_VERSION) && pwd)
+KERNEL_SRC ?= $(XEN_ROOT)/build-linux-$(KERNEL_VERSION)
ifeq ($(KERNEL_SRC),)
$(error Kernel source for kernel $(KERNEL_VERSION) not found)
endif
# Get the full kernel release version from its makefile, as the source path
-# may not have the extraversion, e.g. linux-2.6.12-xen0 may contain release
2.6.12.6-xen0.
+# 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 ee16cdeddade tools/vnet/vnet-module/varp.c
--- a/tools/vnet/vnet-module/varp.c Wed Apr 25 09:39:08 2007
+++ b/tools/vnet/vnet-module/varp.c Fri Apr 27 22:19:39 2007
@@ -1530,12 +1530,7 @@
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 ee16cdeddade tools/vnet/vnet-module/vnet.c
--- a/tools/vnet/vnet-module/vnet.c Wed Apr 25 09:39:08 2007
+++ b/tools/vnet/vnet-module/vnet.c Fri Apr 27 22:19:39 2007
@@ -693,12 +693,7 @@
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 ee16cdeddade tools/vnet/vnetd/Makefile
--- a/tools/vnet/vnetd/Makefile Wed Apr 25 09:39:08 2007
+++ b/tools/vnet/vnetd/Makefile Fri Apr 27 22:19:39 2007
@@ -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 @@
# Comment out when outside xen.
#include $(XEN_ROOT)/tools/Rules.mk
+
+INSTALL_PROG ?= $(INSTALL) -m0755 -p
VNETD_INSTALL_DIR = /usr/sbin
diff -r ee16cdeddade tools/vnet/vnetd/sys_kernel.h
--- a/tools/vnet/vnetd/sys_kernel.h Wed Apr 25 09:39:08 2007
+++ b/tools/vnet/vnetd/sys_kernel.h Fri Apr 27 22:19:39 2007
@@ -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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home