]> xenbits.xensource.com Git - xentesttools/bootstrap.git/commitdiff
Makefile: python dependens
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 10 Feb 2015 16:23:11 +0000 (11:23 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 10 Feb 2015 16:36:18 +0000 (11:36 -0500)
We need python for 'pygrub' and 'xend'. However it is
unclear why we need 'python-extra's such as the development
libraries. As such just move them to their own build
stanza and we can tweak this at some other point.

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

index 53b2140ee376b0bf1c4f8af67f8e716f0dafe451..2d2ed46f25345b51ec7ebe661bd900702f778e1b 100644 (file)
@@ -769,7 +769,6 @@ endif
        $(call RPM_TO_USERSPACE,*libdb-*.so*,$(RPM_DIR)/db4)
        $(call RPM_TO_USERSPACE,*libbz2.so*,$(RPM_DIR)/bzip2-libs)
        $(call RPM_TO_USERSPACE,*liblzma.so*,$(RPM_DIR)/xz-libs)
-       $(call RPM_TO_USERSPACE,*libpython2.*.so*,$(RPM_DIR)/python-devel)
        $(call RPM_TO_USERSPACE,*libxml2.so*,$(RPM_DIR)/libxml2)
        $(call RPM_TO_USERSPACE,*libidn.so*,$(RPM_DIR)/libidn)
        $(call RPM_TO_USERSPACE,*libexpat.so*,$(RPM_DIR)/expat)
@@ -780,10 +779,11 @@ python-core: python-deps
        $(call RPM_INSTALL,$(RPM_DIR)/python)
        ln -sf /usr/bin/env userspace/bin/env
 
-.PHONY:        python-install
-python-install: python-core
+.PHONY:        python-extra
+python-extra: python-core
        # Now that python has been installed ...
        @echo "Installing python extras"
+       $(call RPM_TO_USERSPACE,*libpython2.*.so*,$(RPM_DIR)/python-devel)
        $(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
@@ -791,6 +791,9 @@ python-install: python-core
        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"