[PATCH] automake: remove patch

[PATCH] automake: remove patch

[Joseph A. Lutz]

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 <joseph.lutz@novatechweb.com>
---
 ...-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

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 f8334a7..0000000
--- 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 <obi@opendreambox.org>
-
-Updated for automake-1.12.6
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-
-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 e3cb85b..4ce26b4 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"
 
-- 
2.6.2

Re: [PATCH] automake: remove patch

[Richard Purdie]

On Thu, 2016-02-25 at 17:02 -0600, Joseph A. Lutz wrote:
> 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 <joseph.lutz@novatechweb.com>

This breaks the builds:

https://autobuilder.yoctoproject.org/main/builders/nightly-mips-lsb/bui
lds/652/steps/BuildImages/logs/stdio

Cheers,

Richard

Re: [PATCH] automake: remove patch

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]

On 27 February 2016 at 08:34, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> This breaks the builds:
>
> https://autobuilder.yoctoproject.org/main/builders/nightly-mips-lsb/bui
> lds/652/steps/BuildImages/logs/stdio
>

I've just sent a small patch to allow *.pyc to get packaged into cracklib
so this should be resolved.  I'll test again when mut next runs.

Ross

[-- Attachment #2: Type: text/html, Size: 980 bytes --]