ChangeSet 1.1408, 2005/05/14 01:21:03+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
Merge 2.0-testing changes:
- Install xen binary with version number appended and create several
symlinks
for less specific version numbers.
- Change XEN_EXTRAVERSION to -testing, move surrounding-" to
compile.h.in.
Also define XEN_FULLVESION and use.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
buildconfigs/mk.linux-2.4-xen0 | 5 +++++
buildconfigs/mk.linux-2.4-xenU | 5 +++++
buildconfigs/mk.linux-2.6-xen0 | 6 +++++-
buildconfigs/mk.linux-2.6-xenU | 6 +++++-
linux-2.4.29-xen-sparse/arch/xen/Makefile | 2 ++
xen/Makefile | 8 ++++----
6 files changed, 26 insertions(+), 6 deletions(-)
diff -Nru a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
--- a/buildconfigs/mk.linux-2.4-xen0 2005-05-13 21:03:50 -04:00
+++ b/buildconfigs/mk.linux-2.4-xen0 2005-05-13 21:03:50 -04:00
@@ -45,6 +45,11 @@
make -C $(LINUX_DIR) ARCH=xen oldconfig
make -C $(LINUX_DIR) ARCH=xen dep
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen dep
+
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
diff -Nru a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
--- a/buildconfigs/mk.linux-2.4-xenU 2005-05-13 21:03:50 -04:00
+++ b/buildconfigs/mk.linux-2.4-xenU 2005-05-13 21:03:50 -04:00
@@ -38,6 +38,11 @@
make -C $(LINUX_DIR) ARCH=xen oldconfig
make -C $(LINUX_DIR) ARCH=xen dep
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen dep
+
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
diff -Nru a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
--- a/buildconfigs/mk.linux-2.6-xen0 2005-05-13 21:03:50 -04:00
+++ b/buildconfigs/mk.linux-2.6-xen0 2005-05-13 21:03:50 -04:00
@@ -33,9 +33,13 @@
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p'
$(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION
$(LINUX_DIR)/.config \
- || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
+ || cp
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
$(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
+
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
diff -Nru a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
--- a/buildconfigs/mk.linux-2.6-xenU 2005-05-13 21:03:51 -04:00
+++ b/buildconfigs/mk.linux-2.6-xenU 2005-05-13 21:03:51 -04:00
@@ -33,9 +33,13 @@
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p'
$(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION
$(LINUX_DIR)/.config \
- || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
+ || cp
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
$(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
+
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
diff -Nru a/linux-2.4.29-xen-sparse/arch/xen/Makefile
b/linux-2.4.29-xen-sparse/arch/xen/Makefile
--- a/linux-2.4.29-xen-sparse/arch/xen/Makefile 2005-05-13 21:03:50 -04:00
+++ b/linux-2.4.29-xen-sparse/arch/xen/Makefile 2005-05-13 21:03:50 -04:00
@@ -61,6 +61,7 @@
SUBDIRS += arch/xen/drivers/evtchn
SUBDIRS += arch/xen/drivers/blkif
SUBDIRS += arch/xen/drivers/netif
+SUBDIRS += arch/xen/drivers/usbif
SUBDIRS += arch/xen/drivers/balloon
ifdef CONFIG_XEN_PRIVILEGED_GUEST
SUBDIRS += arch/xen/drivers/dom0
@@ -71,6 +72,7 @@
CORE_FILES += arch/xen/drivers/console/drv.o
DRIVERS += arch/xen/drivers/blkif/drv.o
DRIVERS += arch/xen/drivers/netif/drv.o
+DRIVERS += arch/xen/drivers/usbif/drv.o
ifdef CONFIG_XEN_PRIVILEGED_GUEST
CORE_FILES += arch/xen/drivers/dom0/drv.o
endif
diff -Nru a/xen/Makefile b/xen/Makefile
--- a/xen/Makefile 2005-05-13 21:03:51 -04:00
+++ b/xen/Makefile 2005-05-13 21:03:51 -04:00
@@ -8,9 +8,9 @@
# This is the correct place to edit the build version.
# All other places this is stored (eg. compile.h) should be autogenerated.
-export XEN_VERSION = 2
+export XEN_VERSION = 3
export XEN_SUBVERSION = 0
-export XEN_EXTRAVERSION = -testing
+export XEN_EXTRAVERSION = -devel
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
export BASEDIR := $(CURDIR)
@@ -83,9 +83,9 @@
@mv -f $@.new $@
tools/figlet/figlet: tools/figlet/figlet.o
- $(CC) -o $@ $<
+ $(HOSTCC) -o $@ $<
tools/figlet/figlet.o: tools/figlet/figlet.c
- $(CC) -o $@ -c $<
+ $(HOSTCC) -o $@ -c $<
include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) > $@.new
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home