Makefile: Stop building Python for Xen 4.5 or later.

We still bundle Python code even if we do not need. In
the past the only reason for doing it was for Xend but
since that is gone..

However the python-dependency brought in some other dependencies
shared by other programs - gdb and perl. As such make this
dependency be part of the targets.

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

diff --git a/root_image/Makefile b/root_image/Makefile
index 12ce7b2b1f9b7f321df56299da5525d8c5c2d584..fe7abca3057ece9204287520475a51c0734bf562 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -808,6 +808,8 @@ python-install: python-deps python-core
 
 .PHONY:        perl-core
 perl-core:
+       $(call RPM_TO_USERSPACE,*libgdbm.so*,$(RPM_DIR)/gdbm)
+       $(call RPM_TO_USERSPACE,*libdb-*.so*,$(RPM_DIR)/db4)
        @echo "Installing perl tools"
        $(call RPM_INSTALL,$(RPM_DIR)/perl)
 
@@ -902,9 +904,10 @@ 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
+xend-install: yajl-depend xen-4.2-depend
        if [ $(XEN_VERSION) -lt 5 ]; then \
                $(MAKE) python-extra; \
+               $(MAKE) xen-python-bytecode; \
        fi
 #      Install all of xen
        cp -rdf $(XEN_DISTDIR)/usr                                            userspace/
@@ -1040,6 +1043,11 @@ ifeq ($(RPM_ARCH), x86_64)
        (cd userspace/usr$(LIBSDIR); ln -fs  ../lib/libraw1394.so.11)
 endif
 
+.PHONY: gdb-install
+gdb-install: add-debug-bins
+       $(call RPM_TO_USERSPACE,*libexpat.so*,$(RPM_DIR)/expat)
+       $(call RPM_TO_USERSPACE,./usr/bin/gdb,$(RPM_DIR)/gdb)
+
 .PHONY:        root_image-tools-install
 root_image-tools-install: userspace-prep