From bee0f633f0b5ef2439b8e5d54cbfc7bc1f17f47e Mon Sep 17 00:00:00 2001 From: "Joseph A. Lutz" Date: Thu, 25 Feb 2016 17:02:35 -0600 Subject: 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. Signed-off-by: Joseph A. Lutz Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...-compile-compile-only-optimized-byte-code.patch | 42 ---------------------- meta/recipes-devtools/automake/automake_1.15.bb | 1 - 2 files changed, 43 deletions(-) delete mode 100644 meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch (limited to 'meta') 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 @@ -Upstream-Status: Inappropriate [embedded specific] - -* OE-Core's python creates the same binary output - for both pyc and pyo, so disable the creation of - pyc files by automake. - -Signed-off-by: Andreas Oberritter - -Updated for automake-1.12.6 - -Signed-off-by: Marko Lindqvist - -diff -Nurd automake-1.12.6/lib/py-compile automake-1.12.6/lib/py-compile ---- automake-1.12.6/lib/py-compile 2012-12-13 21:57:31.000000000 +0200 -+++ automake-1.12.6/lib/py-compile 2012-12-27 19:34:01.426015140 +0200 -@@ -115,26 +115,6 @@ - filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" - fi - --$PYTHON -c " --import sys, os, py_compile, imp -- --files = '''$files''' -- --sys.stdout.write('Byte-compiling python modules...\n') --for file in files.split(): -- $pathtrans -- $filetrans -- if not os.path.exists(filepath) or not (len(filepath) >= 3 -- and filepath[-3:] == '.py'): -- continue -- sys.stdout.write(file) -- sys.stdout.flush() -- if hasattr(imp, 'get_tag'): -- py_compile.compile(filepath, imp.cache_from_source(filepath), path) -- else: -- py_compile.compile(filepath, filepath + 'c', path) --sys.stdout.write('\n')" || exit $? -- - # this will fail for python < 1.5, but that doesn't matter ... - $PYTHON -O -c " - 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} += "\ RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" SRC_URI += " file://python-libdir.patch \ - file://py-compile-compile-only-optimized-byte-code.patch \ file://buildtest.patch \ file://performance.patch \ file://new_rt_path_for_test-driver.patch" -- cgit 1.2.3-korg