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:09:21 +0100 |
| commit | af2deca6ae8cc5abe4c0c1fe49e459e70e5ac6e1 (patch) | |
| tree | ceaf6c9fd3ba7bff44b5134ea724d5db0e440a89 /meta | |
| parent | 62dae66e0d107cdc25440ebc6ccfc7f41e161873 (diff) | |
| download | poky-af2deca6ae8cc5abe4c0c1fe49e459e70e5ac6e1.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.
(From OE-Core rev: d9941a2d9b423af2ca3313e8c1357ccfcc9a96a5)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 3efa7deec4..dce778a593 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" | |||
| 180 | 180 | ||
| 181 | py_package_preprocess () { | 181 | py_package_preprocess () { |
| 182 | # copy back the old Makefile to fix target package | 182 | # copy back the old Makefile to fix target package |
| 183 | install -m 0644 Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile | 183 | install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile |
| 184 | # Remove references to buildmachine paths in target Makefile | 184 | # Remove references to buildmachine paths in target Makefile |
| 185 | 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 | 185 | 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 |
| 186 | } | 186 | } |
diff --git a/meta/recipes-devtools/python/python_2.7.9.bb b/meta/recipes-devtools/python/python_2.7.9.bb index 19190c3042..803a1fc749 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" | |||
| 135 | 135 | ||
| 136 | py_package_preprocess () { | 136 | py_package_preprocess () { |
| 137 | # copy back the old Makefile to fix target package | 137 | # copy back the old Makefile to fix target package |
| 138 | install -m 0644 Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile | 138 | install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile |
| 139 | 139 | ||
| 140 | # Remove references to buildmachine paths in target Makefile | 140 | # Remove references to buildmachine paths in target Makefile |
| 141 | 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 | 141 | 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 |