summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-10 14:31:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 07:42:28 +0100
commit27849379a71ba200b461d045a4946eacba8cd62f (patch)
tree9ce14cde24a2a3d57b27b79a53dee383898337ef
parent0fa20ac73bbff4c7c24123360468464cff003e3a (diff)
downloadpoky-27849379a71ba200b461d045a4946eacba8cd62f.tar.gz
python3: remove patch that inadvertently disables xattrs
This patch dates back to the addition of the Python 3 recipe to oe-core, and as listxattr is never added to supports_follow_symlinks the extended attribute support will never be enabled. (From OE-Core rev: 9806e141e85b4e4c38eb7b45e6f2fbc2d2aed29d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3-native_3.5.5.bb1
-rw-r--r--meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch17
-rw-r--r--meta/recipes-devtools/python/python3_3.5.5.bb1
3 files changed, 0 insertions, 19 deletions
diff --git a/meta/recipes-devtools/python/python3-native_3.5.5.bb b/meta/recipes-devtools/python/python3-native_3.5.5.bb
index 7b940a16d2..b231542f46 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.5.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.5.bb
@@ -15,7 +15,6 @@ file://150-fix-setupterm.patch \
15file://python-3.3-multilib.patch \ 15file://python-3.3-multilib.patch \
16file://03-fix-tkinter-detection.patch \ 16file://03-fix-tkinter-detection.patch \
17file://avoid_warning_about_tkinter.patch \ 17file://avoid_warning_about_tkinter.patch \
18file://shutil-follow-symlink-fix.patch \
19file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ 18file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
20file://sysroot-include-headers.patch \ 19file://sysroot-include-headers.patch \
21file://unixccompiler.patch \ 20file://unixccompiler.patch \
diff --git a/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch b/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch
deleted file mode 100644
index 802b1c7203..0000000000
--- a/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1shutils should consider symlinks
2
3-Khem
4
5Upstream-Status: Pending
6
7--- a/Lib/shutil.py 2013-01-29 12:31:06.926555779 -0800
8+++ b/Lib/shutil.py 2013-01-29 16:31:39.097554182 -0800
9@@ -132,7 +132,7 @@ def copymode(src, dst, *, follow_symlink
10 st = stat_func(src)
11 chmod_func(dst, stat.S_IMODE(st.st_mode))
12
13-if hasattr(os, 'listxattr'):
14+if hasattr(os, 'listxattr') and os.listxattr in os.supports_follow_symlinks:
15 def _copyxattr(src, dst, *, follow_symlinks=True):
16 """Copy extended filesystem attributes from `src` to `dst`.
17
diff --git a/meta/recipes-devtools/python/python3_3.5.5.bb b/meta/recipes-devtools/python/python3_3.5.5.bb
index 6598b486af..02decf470c 100644
--- a/meta/recipes-devtools/python/python3_3.5.5.bb
+++ b/meta/recipes-devtools/python/python3_3.5.5.bb
@@ -28,7 +28,6 @@ SRC_URI += "\
28 file://cgi_py.patch \ 28 file://cgi_py.patch \
29 file://host_include_contamination.patch \ 29 file://host_include_contamination.patch \
30 file://python-3.3-multilib.patch \ 30 file://python-3.3-multilib.patch \
31 file://shutil-follow-symlink-fix.patch \
32 file://sysroot-include-headers.patch \ 31 file://sysroot-include-headers.patch \
33 file://unixccompiler.patch \ 32 file://unixccompiler.patch \
34 file://avoid-ncursesw-include-path.patch \ 33 file://avoid-ncursesw-include-path.patch \