From 9806e141e85b4e4c38eb7b45e6f2fbc2d2aed29d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 10 Sep 2018 14:31:22 +0100 Subject: 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3-native_3.5.5.bb | 1 - .../python/python3/shutil-follow-symlink-fix.patch | 17 ----------------- meta/recipes-devtools/python/python3_3.5.5.bb | 1 - 3 files changed, 19 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch 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 \ file://python-3.3-multilib.patch \ file://03-fix-tkinter-detection.patch \ file://avoid_warning_about_tkinter.patch \ -file://shutil-follow-symlink-fix.patch \ file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ file://sysroot-include-headers.patch \ file://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 @@ -shutils should consider symlinks - --Khem - -Upstream-Status: Pending - ---- a/Lib/shutil.py 2013-01-29 12:31:06.926555779 -0800 -+++ b/Lib/shutil.py 2013-01-29 16:31:39.097554182 -0800 -@@ -132,7 +132,7 @@ def copymode(src, dst, *, follow_symlink - st = stat_func(src) - chmod_func(dst, stat.S_IMODE(st.st_mode)) - --if hasattr(os, 'listxattr'): -+if hasattr(os, 'listxattr') and os.listxattr in os.supports_follow_symlinks: - def _copyxattr(src, dst, *, follow_symlinks=True): - """Copy extended filesystem attributes from `src` to `dst`. - 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 += "\ file://cgi_py.patch \ file://host_include_contamination.patch \ file://python-3.3-multilib.patch \ - file://shutil-follow-symlink-fix.patch \ file://sysroot-include-headers.patch \ file://unixccompiler.patch \ file://avoid-ncursesw-include-path.patch \ -- cgit 1.2.3-korg