From 093ed41b0f0d89cb6344acdf6bb62cb9ca597f2f Mon Sep 17 00:00:00 2001 From: Morgan Little Date: Thu, 19 Jul 2012 13:46:06 -0400 Subject: python-native: Put binaries in seperate directory Update python-native to install the binaries in the python-native directory, add pythonnative.bbclass to let recipes that need python-native use the binaries and update disutils access the new binaries. Update distutils-base to inherit pythonnative. (From OE-Core rev: a2e554f731437545e9483a7a73e6847c03f6f48a) Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-native_2.7.3.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb index 50bf894d0c..bfdcd12687 100644 --- a/meta/recipes-devtools/python/python-native_2.7.3.bb +++ b/meta/recipes-devtools/python/python-native_2.7.3.bb @@ -1,6 +1,6 @@ require python.inc DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI += "file://04-default-is-optimized.patch \ file://05-enable-ctypes-cross-build.patch \ @@ -20,6 +20,8 @@ inherit native RPROVIDES += "python-distutils-native python-compression-native python-textutils-native python-core-native" +EXTRA_OECONF += " --bindir=${bindir}/${PN}" + EXTRA_OEMAKE = '\ BUILD_SYS="" \ HOST_SYS="" \ @@ -34,11 +36,11 @@ do_configure_prepend() { do_install() { oe_runmake 'DESTDIR=${D}' install - install -d ${D}${bindir}/ - install -m 0755 Parser/pgen ${D}${bindir}/ + install -d ${D}${bindir}/${PN} + install -m 0755 Parser/pgen ${D}${bindir}/${PN} # Make sure we use /usr/bin/env python - for PYTHSCRIPT in `grep -rIl ${bindir}/python ${D}${bindir}`; do + for PYTHSCRIPT in `grep -rIl ${bindir}/${PN}/python ${D}${bindir}/${PN}`; do sed -i -e '1s|^#!.*|#!/usr/bin/env python|' $PYTHSCRIPT done } -- cgit v1.2.3-54-g00ecf