summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoseph A. Lutz <joseph.lutz@novatechweb.com>2016-02-25 17:02:35 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-02 22:39:45 +0000
commitc366343724ee5091ce2f06c2d230288a678015f7 (patch)
tree04726b78b12a492733a6b1c9a5de64a0c98397ed /meta
parentd6e63beb725296f8ae1bc5aca2b0e4e9b8874180 (diff)
downloadpoky-c366343724ee5091ce2f06c2d230288a678015f7.tar.gz
automake: don't delete .pyc files
The patch being removed in this commit removes *.pyc files from being compiled. This dose not allow a user to select which files are included in the image. Since optimization is no longer the default for python we should have the ability to choose what is included in the image. (From OE-Core rev: bee0f633f0b5ef2439b8e5d54cbfc7bc1f17f47e) Signed-off-by: Joseph A. Lutz <joseph.lutz@novatechweb.com> 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/automake/automake/py-compile-compile-only-optimized-byte-code.patch42
-rw-r--r--meta/recipes-devtools/automake/automake_1.15.bb1
2 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch b/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
deleted file mode 100644
index f8334a7212..0000000000
--- a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3* OE-Core's python creates the same binary output
4 for both pyc and pyo, so disable the creation of
5 pyc files by automake.
6
7Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
8
9Updated for automake-1.12.6
10
11Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
12
13diff -Nurd automake-1.12.6/lib/py-compile automake-1.12.6/lib/py-compile
14--- automake-1.12.6/lib/py-compile 2012-12-13 21:57:31.000000000 +0200
15+++ automake-1.12.6/lib/py-compile 2012-12-27 19:34:01.426015140 +0200
16@@ -115,26 +115,6 @@
17 filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
18 fi
19
20-$PYTHON -c "
21-import sys, os, py_compile, imp
22-
23-files = '''$files'''
24-
25-sys.stdout.write('Byte-compiling python modules...\n')
26-for file in files.split():
27- $pathtrans
28- $filetrans
29- if not os.path.exists(filepath) or not (len(filepath) >= 3
30- and filepath[-3:] == '.py'):
31- continue
32- sys.stdout.write(file)
33- sys.stdout.flush()
34- if hasattr(imp, 'get_tag'):
35- py_compile.compile(filepath, imp.cache_from_source(filepath), path)
36- else:
37- py_compile.compile(filepath, filepath + 'c', path)
38-sys.stdout.write('\n')" || exit $?
39-
40 # this will fail for python < 1.5, but that doesn't matter ...
41 $PYTHON -O -c "
42 import sys, os, py_compile, imp
diff --git a/meta/recipes-devtools/automake/automake_1.15.bb b/meta/recipes-devtools/automake/automake_1.15.bb
index 85494b4af0..a3c72fd334 100644
--- a/meta/recipes-devtools/automake/automake_1.15.bb
+++ b/meta/recipes-devtools/automake/automake_1.15.bb
@@ -19,7 +19,6 @@ RDEPENDS_${PN} += "\
19RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" 19RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native"
20 20
21SRC_URI += " file://python-libdir.patch \ 21SRC_URI += " file://python-libdir.patch \
22 file://py-compile-compile-only-optimized-byte-code.patch \
23 file://buildtest.patch \ 22 file://buildtest.patch \
24 file://performance.patch \ 23 file://performance.patch \
25 file://new_rt_path_for_test-driver.patch" 24 file://new_rt_path_for_test-driver.patch"