[PATCH][meta-python 1/5] python-slip-dbus: don't use relative paths

[PATCH][meta-python 1/5] python-slip-dbus: don't use relative paths

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-python/recipes-devtools/python/python-slip-dbus.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python-slip-dbus.inc b/meta-python/recipes-devtools/python/python-slip-dbus.inc
index 9e726b5b92..ab7b1bb06c 100644
--- a/meta-python/recipes-devtools/python/python-slip-dbus.inc
+++ b/meta-python/recipes-devtools/python/python-slip-dbus.inc
@@ -21,7 +21,7 @@ SRC_URI[md5sum] = "28ae5f93853466c44ec96706ba2a1eb4"
 SRC_URI[sha256sum] = "c726c086f0dd93a0ac7a0176f383a12af91b6657b78a301e3f5b25d9f8d4d10b"
 
 do_compile_prepend() {
-    sed -e 's/@VERSION@/${PV}/g' setup.py.in > setup.py
+    sed -e 's/@VERSION@/${PV}/g' ${S}/setup.py.in > ${S}/setup.py
 }
 
 RDEPENDS_${PN} += "\
-- 
2.20.1

[PATCH][meta-python 2/5] python-m2crypto: don't use relative paths

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-python/recipes-devtools/python/python-m2crypto.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-m2crypto.inc b/meta-python/recipes-devtools/python/python-m2crypto.inc
index a36ab8a7fa..5f5444f37e 100644
--- a/meta-python/recipes-devtools/python/python-m2crypto.inc
+++ b/meta-python/recipes-devtools/python/python-m2crypto.inc
@@ -32,7 +32,7 @@ export SWIG_FEATURES
 #
 do_configure_prepend() {
     ${CPP} -dM - < /dev/null | grep -v '__\(STDC\|REGISTER_PREFIX\|GNUC\|STDC_HOSTED\)__' \
-    | sed 's/^\(#define \([^ ]*\) .*\)$/#undef \2\n\1/' > SWIG/gcc_macros.h
+    | sed 's/^\(#define \([^ ]*\) .*\)$/#undef \2\n\1/' > ${S}/SWIG/gcc_macros.h
 
     if [ "${SITEINFO_BITS}" = "64" ];then
         bit="64"
@@ -42,11 +42,11 @@ do_configure_prepend() {
 
     if [ -e ${STAGING_INCDIR}/openssl/opensslconf-${bit}.h ] ;then
         for i in SWIG/_ec.i SWIG/_evp.i; do
-            sed -i -e "s/opensslconf.*\./opensslconf-${bit}\./" "$i"
+            sed -i -e "s/opensslconf.*\./opensslconf-${bit}\./" "${S}/$i"
         done
     elif [ -e ${STAGING_INCDIR}/openssl/opensslconf-n${bit}.h ] ;then
         for i in SWIG/_ec.i SWIG/_evp.i; do
-            sed -i -e "s/opensslconf.*\./opensslconf-n${bit}\./" "$i"
+            sed -i -e "s/opensslconf.*\./opensslconf-n${bit}\./" "${S}/$i"
         done
     fi
 }
-- 
2.20.1

[PATCH][meta-python 3/5] python-coloredlogs: don't use relative paths

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-python/recipes-devtools/python/python-coloredlogs.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python-coloredlogs.inc b/meta-python/recipes-devtools/python/python-coloredlogs.inc
index f43bea1f74..bdb1d752c5 100644
--- a/meta-python/recipes-devtools/python/python-coloredlogs.inc
+++ b/meta-python/recipes-devtools/python/python-coloredlogs.inc
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "b869a2dda3fa88154b9dd850e27828d8755bfab5a838a1c97fbc850c6e
 inherit pypi
 
 do_compile_prepend() {
-    sed -ie "s/find_pth_directory(),/'',/g" setup.py
+    sed -ie "s/find_pth_directory(),/'',/g" ${S}/setup.py
 }
 
 do_install_append() {
-- 
2.20.1

[PATCH][meta-python 4/5] python-lxml: remove redundant sed (fixed in 4.3.0 onwards)

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-python/recipes-devtools/python/python-lxml.inc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-lxml.inc b/meta-python/recipes-devtools/python/python-lxml.inc
index 1f7e5abe8b..5dc95e5026 100644
--- a/meta-python/recipes-devtools/python/python-lxml.inc
+++ b/meta-python/recipes-devtools/python/python-lxml.inc
@@ -45,10 +45,6 @@ DEBUG_OPTIMIZATION_append_mipsel = " -O"
 BUILD_OPTIMIZATION_remove_mipsel = " -Og"
 BUILD_OPTIMIZATION_append_mipsel = " -O"
 
-do_configure_prepend() {
-    sed -i -e 's/--version/--modversion/' ${B}/setupinfo.py
-}
-
 BBCLASSEXTEND = "native nativesdk"
 
 RDEPENDS_${PN} += "libxml2 libxslt ${PYTHON_PN}-compression"
-- 
2.20.1

[PATCH][meta-python 5/5] python-lxml: remove redundant RDEPENDS_class-native

[Ross Burton]

python3-native RPROVIDES python3-compression, so the class-native override isn't
required anymore.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-python/recipes-devtools/python/python-lxml.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python-lxml.inc b/meta-python/recipes-devtools/python/python-lxml.inc
index 5dc95e5026..df9573b433 100644
--- a/meta-python/recipes-devtools/python/python-lxml.inc
+++ b/meta-python/recipes-devtools/python/python-lxml.inc
@@ -48,4 +48,3 @@ BUILD_OPTIMIZATION_append_mipsel = " -O"
 BBCLASSEXTEND = "native nativesdk"
 
 RDEPENDS_${PN} += "libxml2 libxslt ${PYTHON_PN}-compression"
-RDEPENDS_${PN}_class-native = "libxml2-native libxslt-native"
-- 
2.20.1