Re: [PATCH v3 08/11] python2.7: improve reproducibility

[Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>]

On Wed, 2017-08-09 at 10:48 -0700, Juro Bystricky wrote:
> The compiled .pyc files contain time stamp corresponding to the compile time.
> This prevents binary reproducibility. This patch allows to achieve binary
> reproducibility by overriding the build time stamp by the value
> exported via SOURCE_DATE_EPOCH.
> 
> Patch by Bernhard M. Wiedemann, backported from https://github.com/python/cpython/pull/296
> 
> [YOCTO#11241]
> 
> Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
> ---
>  .../python/python-native_2.7.13.bb                 |  1 +
>  .../python/python/reproducible.patch               | 34 ++++++++++++++++++++++
>  meta/recipes-devtools/python/python_2.7.13.bb      |  1 +
>  3 files changed, 36 insertions(+)
>  create mode 100644 meta/recipes-devtools/python/python/reproducible.patch
> 
> diff --git a/meta/recipes-devtools/python/python-native_2.7.13.bb b/meta/recipes-devtools/python/python-native_2.7.13.bb
> index 7edf153..a82b7bb 100644
> --- a/meta/recipes-devtools/python/python-native_2.7.13.bb
> +++ b/meta/recipes-devtools/python/python-native_2.7.13.bb
> @@ -17,6 +17,7 @@ SRC_URI += "\
>              file://builddir.patch \
>              file://parallel-makeinst-create-bindir.patch \
>              file://revert_use_of_sysconfigdata.patch \
> +            file://reproducible.patch \


Not really important but it would be better to rename the patch to
something more specific
('repoducible-build-time-override-by-source-date-epoch.path'), allowing
future patches in this area. Besides a better name, it helps to quickly
identify the patch purpose without looking at the code itself.



>             "
>  
>  S = "${WORKDIR}/Python-${PV}"
> diff --git a/meta/recipes-devtools/python/python/reproducible.patch b/meta/recipes-devtools/python/python/reproducible.patch
> new file mode 100644
> index 0000000..1265179
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python/reproducible.patch
> @@ -0,0 +1,34 @@
> +The compiled .pyc files contain time stamp corresponding to the compile time.
> +This prevents binary reproducibility. This patch allows to achieve binary
> +reproducibility by overriding the build time stamp by the value 
> +exported via SOURCE_DATE_EPOCH. 
> +
> +Patch by Bernhard M. Wiedemann
> +
> +Upstream-Status: Backport
> +
> +Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
> +
> +Fri Feb 24 17:08:25 UTC 2017 - bwiedemann@suse.com
> +
> +- Add reproducible.patch to allow reproducible builds of various
> +  python packages like python-amqp
> +  Upstream: https://github.com/python/cpython/pull/296
> +
> +
> +@@ -0,0 +1,15 @@
> +Index: Python-2.7.13/Lib/py_compile.py
> +===================================================================
> +--- Python-2.7.13.orig/Lib/py_compile.py
> ++++ Python-2.7.13/Lib/py_compile.py
> +@@ -108,6 +108,10 @@ def compile(file, cfile=None, dfile=None
> +             timestamp = long(os.fstat(f.fileno()).st_mtime)
> +         except AttributeError:
> +             timestamp = long(os.stat(file).st_mtime)
> ++        sde = os.environ.get('SOURCE_DATE_EPOCH')
> ++        if sde and timestamp > int(sde):
> ++            timestamp = int(sde)
> ++            os.utime(file, (timestamp, timestamp))
> +         codestring = f.read()
> +     try:
> +         codeobject = __builtin__.compile(codestring, dfile or file,'exec')
> diff --git a/meta/recipes-devtools/python/python_2.7.13.bb b/meta/recipes-devtools/python/python_2.7.13.bb
> index 4ef9952..96c3ab2 100644
> --- a/meta/recipes-devtools/python/python_2.7.13.bb
> +++ b/meta/recipes-devtools/python/python_2.7.13.bb
> @@ -27,6 +27,7 @@ SRC_URI += "\
>    file://use_sysroot_ncurses_instead_of_host.patch \
>    file://add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \
>    file://Don-t-use-getentropy-on-Linux.patch \
> +  file://reproducible.patch \
>  "
>  
>  S = "${WORKDIR}/Python-${PV}"
> -- 
> 2.7.4
>