Makefile: When building Xen 4.5 or later don't build with python-extra (nor perl)

As we really don't need them. In the old days of 'Xend' that
might be true - but with Xen 4.5 or later 'Xend' is truly gone.

We do need to rm those files otherwise we end with some extra
dependencies.

I am not sure why we need perl either.

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

diff --git a/root_image/Makefile b/root_image/Makefile
index 2d2ed46f25345b51ec7ebe661bd900702f778e1b..9b2dacb5df888885a2ac61be8309c8fc74cb4bf4 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -787,13 +787,13 @@ python-extra: python-core
        $(call RPM_INSTALL,$(RPM_DIR)/libxml2-python)
        #rm -f userspace/usr/lib64/python2.6/site-packages/libxml2mod.la
        #rm -f userspace/usr/lib64/python2.6/lib-dynload/pyexpat.so
+
+.PHONY: python-install
+python-install: python-deps python-core
        rm -f userspace/usr/lib*/python2.6/lib-dynload/_ctypes.so
        rm -f userspace/usr/lib*/python2.6/lib-dynload/_sqlite3.so
        rm -f userspace/usr/lib*/python2.6/idlelib/*.bat
 
-.PHONY: python-install
-python-install: python-deps python-core python-extra
-
 .PHONY:        perl-core
 perl-core:
        @echo "Installing perl tools"
@@ -808,7 +808,7 @@ yajl-depend:
        $(call RPM_TO_USERSPACE,*libyajl.so*,$(RPM_DIR)/yajl)
 
 .PHONY: xen-4.2-depend
-xen-4.2-depend: perl-core
+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)
@@ -881,9 +881,13 @@ endif
 
 XEN_SRC = $(dir $(CURDIR))xen
 XEN_DISTDIR = $(dir $(CURDIR))xen/dist/install
+XEN_VERSION = $(shell cat $(XEN_SRC)/xen/Makefile |grep XEN_SUBVERSION | head -1 | sed s/.*=// | sed s/\ //)
 
 .PHONY: xend-install
 xend-install: xen-python-bytecode yajl-depend xen-4.2-depend
+       if [ $(XEN_VERSION) -lt 5 ]; then \
+               $(MAKE) python-extra perl-core; \
+       fi
 #      Install all of xen
        cp -rdf $(XEN_DISTDIR)/usr                                            userspace/
        cp -rdf $(XEN_DISTDIR)/etc/bash_completion.d                            userspace/etc/bash_completion.d