diff options
author | Ross Burton <ross.burton@intel.com> | 2015-07-07 23:55:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-16 15:08:44 +0100 |
commit | d9941a2d9b423af2ca3313e8c1357ccfcc9a96a5 (patch) | |
tree | a47cea7deb45f1454fa486e685ab1cf81c2576b3 /meta | |
parent | bb458d6c085e4c3d9d4ee8b1fba23600e2d7376b (diff) | |
download | openembedded-core-contrib-d9941a2d9b423af2ca3313e8c1357ccfcc9a96a5.tar.gz |
python: add explicit directories in py_package_preprocess
py_package_preprocess() was using relative paths which mean it depends on
exactly what directory it starts in. To clarify the code, always use absolute
paths.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python3_3.4.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python_2.7.9.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python3_3.4.3.bb b/meta/recipes-devtools/python/python3_3.4.3.bb index 3efa7deec4b..dce778a5935 100644 --- a/meta/recipes-devtools/python/python3_3.4.3.bb +++ b/meta/recipes-devtools/python/python3_3.4.3.bb @@ -180,7 +180,7 @@ PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess" py_package_preprocess () { # copy back the old Makefile to fix target package - install -m 0644 Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile + install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile # Remove references to buildmachine paths in target Makefile sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile } diff --git a/meta/recipes-devtools/python/python_2.7.9.bb b/meta/recipes-devtools/python/python_2.7.9.bb index 19190c3042b..803a1fc7497 100644 --- a/meta/recipes-devtools/python/python_2.7.9.bb +++ b/meta/recipes-devtools/python/python_2.7.9.bb @@ -135,7 +135,7 @@ PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess" py_package_preprocess () { # copy back the old Makefile to fix target package - install -m 0644 Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile + install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile # Remove references to buildmachine paths in target Makefile sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile |