Makefile: Be able to build Xen 4.2

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/Makefile b/Makefile
index dc1410854f9469d12e29f19ae3ec1793abcaf4a1..6283e42bef1322f7774c711b0d47c093522fd47c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -149,13 +149,16 @@ linux-distclean: linux-clean
 
 XEN_DISTDIR = xen/dist/install
 
-XEN_EXTRAVERSION := $(shell date +-%y%m%d)$(xen_TAG)
-
 xen-DISTRIB_TARGET = dist/common/xen.gz
 
 .PHONY: xen-dist-nodep
 xen-dist-nodep:
-       $(MAKE) XEN_EXTRAVERSION=$(XEN_EXTRAVERSION) -C xen xen -j$$(($(NCPUS) * 2))
+       if [ -e xen/tools/configure ]; then \
+               if ! [ -e xen/tools/config.h ]; \
+                       then (cd xen;./configure); \
+               fi; \
+       fi
+       $(MAKE) -C xen xen -j$$(($(NCPUS) * 2))
        $(INSTALL_DIR) dist/common/
        $(INSTALL_DATA) $(XEN_DISTDIR)/boot/xen.gz dist/common/
 
@@ -164,7 +167,8 @@ IOEMU_DIR = ioemu-remote
 
 .PHONY: xen-tools
 xen-tools:
-       $(MAKE) -C xen IOEMU_CONFIGURE_CROSS="--disable-gfx-check --disable-curses --disable-slirp --disable-opengl --disable-sdl --disable-kvm" tools -j$$(($(NCPUS) * 2))
+       $(MAKE) -C xen dist-misc -j$$(($(NCPUS) * 2))
+       $(MAKE) -C xen IOEMU_CONFIGURE_CROSS="--disable-curses --disable-slirp --disable-opengl --disable-sdl --disable-kvm --disable-vnc-tls" tools -j$$(($(NCPUS) * 2))
 
 .PHONY: xen-dist
 xen-dist: xen-dist-nodep xen-tools
@@ -180,7 +184,7 @@ xen-distclean: xen-clean
        if [ -e xen ]; then \
                $(MAKE) -C xen distclean; \
        fi \
-k
+
 #####################################################################
 #                            root_image rules
 #####################################################################
@@ -195,7 +199,7 @@ root_image-dist-nodep:  $(LINUX_SRC)/usr/gen_init_cpio
        $(INSTALL_DIR) dist/common/
        $(INSTALL_DATA) root_image/dist/common/initramfs.cpio.gz dist/common/
 
-.PHONY: root_image-dist
+.PHONY: root_image-dist xen-dist linux-dist
 root_image-dist: $(DOM0_DEP_LIST)
        $(MAKE) root_image-dist-nodep
 

diff --git a/root_image/Makefile b/root_image/Makefile
index d6057c50ce74561bb2a3fb0d64adb50839c2d7c3..40701af4e30fc1af8d32dfabbf10d73ccea787a5 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -796,11 +796,23 @@ xen-python-bytecode: python-install
 yajl-depend:
        $(call RPM_TO_USERSPACE,*libyajl.so*,$(RPM_DIR)/yajl)
 
+.PHONY: xen-4.2-depend
+xen-4.2-depend:
+       $(call RPM_TO_USERSPACE,*libcurl.so*,$(RPM_DIR)/libcurl)
+       $(call RPM_TO_USERSPACE,*libcares.so*,$(RPM_DIR)/c-ares)
+       $(call RPM_TO_USERSPACE,*libsasl2.so*,$(RPM_DIR)/cyrus-sasl-lib)
+       $(call RPM_TO_USERSPACE,*libssl3.so*,$(RPM_DIR)/nss)
+       $(call RPM_TO_USERSPACE,*libsmime3.so*,$(RPM_DIR)/nss)
+       $(call RPM_TO_USERSPACE,*libssh2.so*,$(RPM_DIR)/libssh2)
+       $(call RPM_TO_USERSPACE,*liblber*.so*,$(RPM_DIR)/openldap)
+       $(call RPM_TO_USERSPACE,*libldap*.so*,$(RPM_DIR)/openldap)
+       $(call RPM_TO_USERSPACE,*libgthread*.so*,$(RPM_DIR)/glib2)
+
 XEN_SRC = $(dir $(CURDIR))xen
 XEN_DISTDIR = $(dir $(CURDIR))xen/dist/install
 
 .PHONY: xend-install
-xend-install: xen-python-bytecode yajl-depend
+xend-install: xen-python-bytecode yajl-depend xen-4.2-depend
 #      Install all of xen
        cp -rdf $(XEN_DISTDIR)/usr                                            userspace/
        cp -rdf $(XEN_DISTDIR)/etc/bash_completion.d                            userspace/etc/bash_completion.d