diff -r d5ac63b22fb8 mk/Makefile.xcp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/Makefile.xcp	Thu May 06 22:43:30 2010 +0100
@@ -0,0 +1,73 @@
+# makefile for xen component in build system
+
+REPO_NAME= xen-3.4
+XEN_VERSION= 3.4
+XEN_RELEASE= xcp0.2
+XEN_DOCDIR=/usr/share/doc/xen
+CARBON_DISTFILES=../
+
+export CONFIG_QEMU=../qemu-xen-3.4.hg
+
+J_FLAG = 8
+MAKE_CMD= $(MAKE) -j$(J_FLAG) -C $(REPO) LINUX_SRC_PATH=${CARBON_DISTFILES}
+
+32ON64 := y
+PAE := y
+DOMAIN0_ARCH_OPTIMIZED := i686
+
+GDB_VERSION := 6.2.1
+ZLIB_VERSION := 1.2.3
+LIBPCI_VERSION := 2.2.9
+NEWLIB_VERSION := 1.16.0
+LWIP_VERSION := 1.3.0
+GRUB_VERSION := 0.97
+LIBCONFIG_VERSION := 1.3.2
+
+CHANGELOG_DATE    := $(shell LANG=C date +"%a %b %d %Y")
+CHANGELOG_USER    := xen.org <http://www.xen.org/>
+CHANGELOG_HEADER  := * $(CHANGELOG_DATE) $(CHANGELOG_USER) [$(XEN_VERSION) $(XEN_RELEASE)]
+CHANGELOG_MESSAGE := - Build Xen hypervisor.
+
+# Xen packages
+RPM_SOURCESDIR := /usr/src/redhat/SOURCES
+RPM_SPECSDIR := /usr/src/redhat/SPECS
+
+SOURCES = $(RPM_SOURCESDIR)/xen-$(XEN_VERSION).tar.bz2 \
+          $(RPM_SOURCESDIR)/libconfig-$(LIBCONFIG_VERSION).tar.gz \
+          $(RPM_SPECSDIR)/xen.spec
+
+XEN_HG_EXCLUDE := -X mk -X oem
+
+
+$(RPM_SOURCESDIR)/xen-$(XEN_VERSION).tar.bz2:
+	hg archive $(XEN_HG_EXCLUDE) -t tbz2 $@
+
+$(RPM_SPECSDIR)/xen.spec: $(REPO_NAME).spec.in
+# Use a temporary file because sed in rhel3 doesn't understand "\n"
+	echo "$(CHANGELOG_HEADER)" > changelog.tmp
+	echo "$(CHANGELOG_MESSAGE)" >> changelog.tmp
+	echo "" >> changelog.tmp
+	sed -e s\,@REPO_VERSION@,$(REPO_VERSION),g \
+	    -e s\,@XEN_VERSION@,$(XEN_VERSION),g   \
+	    -e s\,@XEN_RELEASE@,$(XEN_RELEASE),g   \
+	    -e s\,@GDB_VERSION@,$(GDB_VERSION),g   \
+	    -e s\,@ZLIB_VERSION@,$(ZLIB_VERSION),g   \
+	    -e s\,@LIBPCI_VERSION@,$(LIBPCI_VERSION),g   \
+	    -e s\,@NEWLIB_VERSION@,$(NEWLIB_VERSION),g   \
+	    -e s\,@LWIP_VERSION@,$(LWIP_VERSION),g   \
+	    -e s\,@GRUB_VERSION@,$(GRUB_VERSION),g   \
+	    -e s\,@LIBCONFIG_VERSION@,$(LIBCONFIG_VERSION),g   \
+	    -e s\,@PAE@,$(PAE),g                   \
+	    -e s\,@32ON64@,$(32ON64),g             \
+	    -e \\,%changelog,rchangelog.tmp        \
+	    < $(REPO_NAME).spec.in                       \
+	    > $(RPM_SPECSDIR)/xen.spec
+	-rm changelog.tmp
+
+all: $(RPM_SPECSDIR)/xen.spec $(SOURCES)
+	rpmbuild --target $(DOMAIN0_ARCH_OPTIMIZED) -ba $(RPM_SPECSDIR)/xen.spec
+
+.PHONY: clean
+clean: 
+	rm -f $(SOURCES)
+
diff -r d5ac63b22fb8 mk/xen-3.4.spec.in
--- a/mk/xen-3.4.spec.in	Thu May 06 22:41:02 2010 +0100
+++ b/mk/xen-3.4.spec.in	Thu May 06 22:43:30 2010 +0100
@@ -28,9 +28,9 @@
 Source0: xen-%{version}.tar.bz2
 Source1: gdb-@GDB_VERSION@.tar.bz2
 Source7: libconfig-@LIBCONFIG_VERSION@.tar.gz
-Patch0: xen-development.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: zlib-devel curl-devel gcc-c++ python-devel ncurses-devel e2fsprogs-devel xorg-x11-proto-devel tetex dev86
+#BuildRequires: zlib-devel curl-devel gcc-c++ python-devel ncurses-devel e2fsprogs-devel xorg-x11-proto-devel tetex dev86
+BuildRequires: zlib-devel python-devel ncurses-devel e2fsprogs-devel tetex dev86 x86_64-linux-gcc x86_64-linux-binutils
 # latex
 ExclusiveArch: i386 i686 x86_64
 
@@ -81,7 +81,6 @@
 %prep 
 %setup -q
 cp %{SOURCE1} tools/debugger/gdb/
-%patch0 -p1 -b ~development
 
 %build
 cp %{SOURCE7} tools/libxl
@@ -155,8 +154,8 @@
 %{_sbindir}/xenbaked
 %{_sbindir}/xenconsoled
 %{_sbindir}/xenmon.py
-%{_sbindir}/xenmon.pyc
-%{_sbindir}/xenmon.pyo
+#%{_sbindir}/xenmon.pyc
+#%{_sbindir}/xenmon.pyo
 %{_sbindir}/xenperf
 %{_sbindir}/xenpm
 %{_sbindir}/xenpmd