summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-12-04 15:08:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 12:37:02 +0000
commitba89e87d8ec28e20d75d28b1bb7a240593733c8b (patch)
tree31d12fe695116813f029d9a17b1c3f1e42698b94 /meta/recipes-devtools/python
parentdda336cbbb61110764b29cf8ce9643b04f203ba6 (diff)
downloadpoky-ba89e87d8ec28e20d75d28b1bb7a240593733c8b.tar.gz
python3: drop redundant patch
This patch altered the clean target's behaviour to skip the ipkg-install directory. However this directory isn't created by opkg, opkg-utils, or the package_ipk class; and we don't invoke the clean target as we perform out-of-tree builds. (From OE-Core rev: 9f8bd475701e5d797d3ffc1ba97647101ba0b9b0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python3-native_3.5.6.bb1
-rw-r--r--meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch38
-rw-r--r--meta/recipes-devtools/python/python3_3.5.6.bb1
3 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-devtools/python/python3-native_3.5.6.bb b/meta/recipes-devtools/python/python3-native_3.5.6.bb
index 4c8faf88c0..8476d681c3 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.6.bb
@@ -6,7 +6,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
6file://12-distutils-prefix-is-inside-staging-area.patch \ 6file://12-distutils-prefix-is-inside-staging-area.patch \
7file://python-config.patch \ 7file://python-config.patch \
8file://030-fixup-include-dirs.patch \ 8file://030-fixup-include-dirs.patch \
9file://070-dont-clean-ipkg-install.patch \
10file://080-distutils-dont_adjust_files.patch \ 9file://080-distutils-dont_adjust_files.patch \
11file://130-readline-setup.patch \ 10file://130-readline-setup.patch \
12file://150-fix-setupterm.patch \ 11file://150-fix-setupterm.patch \
diff --git a/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch b/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch
deleted file mode 100644
index f9971c6baf..0000000000
--- a/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1consider opkg directories when cleaning up
2
3-Khem
4
5Upstream-Status: Inappropriate [OE specific]
6
7---
8 Makefile.pre.in | 6 +++---
9 1 file changed, 3 insertions(+), 3 deletions(-)
10
11Index: Python-3.5.3/Makefile.pre.in
12===================================================================
13--- Python-3.5.3.orig/Makefile.pre.in
14+++ Python-3.5.3/Makefile.pre.in
15@@ -1574,8 +1574,8 @@ touch:
16 # Sanitation targets -- clean leaves libraries, executables and tags
17 # files, which clobber removes as well
18 pycremoval:
19- -find $(srcdir) -depth -name '__pycache__' -exec rm -rf {} ';'
20- -find $(srcdir) -name '*.py[co]' -exec rm -f {} ';'
21+ -find $(srcdir) ! -path './ipkg-install/*' -depth -name '__pycache__' -exec rm -rf {} ';'
22+ -find $(srcdir) ! -path './ipkg-install/*' -name '*.py[co]' -exec rm -f {} ';'
23
24 rmtestturds:
25 -rm -f *BAD *GOOD *SKIPPED
26@@ -1589,9 +1589,9 @@ docclean:
27 -rm -rf Doc/tools/sphinx Doc/tools/pygments Doc/tools/docutils
28
29 clean: pycremoval
30- find . -name '*.[oa]' -exec rm -f {} ';'
31- find . -name '*.s[ol]' -exec rm -f {} ';'
32- find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
33+ find . ! -path './ipkg-install/*' -name '*.[oa]' -exec rm -f {} ';'
34+ find . ! -path './ipkg-install/*' -name '*.s[ol]' -exec rm -f {} ';'
35+ find . ! -path './ipkg-install/*' -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
36 find build -name 'fficonfig.h' -exec rm -f {} ';' || true
37 find build -name '*.py' -exec rm -f {} ';' || true
38 find build -name '*.py[co]' -exec rm -f {} ';' || true
diff --git a/meta/recipes-devtools/python/python3_3.5.6.bb b/meta/recipes-devtools/python/python3_3.5.6.bb
index 7e4ddb95e1..cd7991e7f8 100644
--- a/meta/recipes-devtools/python/python3_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3_3.5.6.bb
@@ -9,7 +9,6 @@ DISTRO_SRC_URI_linuxstdbase = ""
9SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ 9SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
10file://python-config.patch \ 10file://python-config.patch \
11file://030-fixup-include-dirs.patch \ 11file://030-fixup-include-dirs.patch \
12file://070-dont-clean-ipkg-install.patch \
13file://130-readline-setup.patch \ 12file://130-readline-setup.patch \
14file://150-fix-setupterm.patch \ 13file://150-fix-setupterm.patch \
15file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ 14file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \