Seems like reproducibility.patch can actually be removed, as it was
accepted upstream?
Alex
On Wed, 7 Jul 2021 at 17:45, wangmy <wan...@fujitsu.com> wrote:
> refresh reproducibility.patch
>
> v57.1.0
> -------
>
> Changes
> ^^^^^^^
> * #2692: Globs are now sorted in 'license_files' restoring reproducibility
> by eliminating variance from disk order.
> * #2714: Update to distutils at pypa/distutils@e2627b7.
> * #2715: Removed reliance on deprecated ssl.match_hostname by removing the
> ssl support. Now any index operations rely on the native SSL implementation.
>
> Documentation changes
> ^^^^^^^^^^^^^^^^^^^^^
> * #2604: Revamped the backward/cross tool compatibility section to remove
> some confusion.
> Add some examples and the version since when ``entry_points`` are
> supported in declarative configuration.
> Tried to make the reading flow a bit leaner, gather some informations
> that were a bit dispersed.
>
> Signed-off-by: Wang Mingyu <wan...@fujitsu.com>
> ---
> .../python3-setuptools/reproducibility.patch | 21 ++++++++++++-------
> ...57.0.0.bb => python3-setuptools_57.1.0.bb} | 2 +-
> 2 files changed, 15 insertions(+), 8 deletions(-)
> rename meta/recipes-devtools/python/{python3-setuptools_57.0.0.bb =>
> python3-setuptools_57.1.0.bb} (94%)
>
> diff --git
> a/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch
> b/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch
> index 149d8ad5ce..fda520658e 100644
> --- a/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch
> +++ b/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch
> @@ -1,4 +1,4 @@
> -The License-File lines in PKG-INFO change ordering depending on the order
> on disk,
> +The License-File lines in PKG-INFO change ordering depending on the order
> on disk,
> for example for python-packaging, one build shows:
>
> License-File: LICENSE
> @@ -15,11 +15,15 @@ This is because glob uses os.listdir() which is
> unsorted. Sort the result to avo
>
> Upstream-Status: Submitted [
> https://github.com/pypa/setuptools/issues/2691]
> Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
> +Signed-off-by: Wang Mingyu <wan...@fujitsu.com>
> +---
> + setuptools/dist.py | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
>
> -Index: setuptools-57.0.0/setuptools/dist.py
> -===================================================================
> ---- setuptools-57.0.0.orig/setuptools/dist.py
> -+++ setuptools-57.0.0/setuptools/dist.py
> +diff --git a/setuptools/dist.py b/setuptools/dist.py
> +index df071c1..fe3c5da 100644
> +--- a/setuptools/dist.py
> ++++ b/setuptools/dist.py
> @@ -15,7 +15,7 @@ import distutils.command
> from distutils.util import strtobool
> from distutils.debug import DEBUG
> @@ -29,12 +33,15 @@ Index: setuptools-57.0.0/setuptools/dist.py
> import itertools
> import textwrap
> from typing import List, Optional, TYPE_CHECKING
> -@@ -603,7 +603,7 @@ class Distribution(_Distribution):
> +@@ -609,7 +609,7 @@ class Distribution(_Distribution):
> return (
> path
> for pattern in patterns
> -- for path in iglob(pattern)
> +- for path in sorted(iglob(pattern))
> + for path in sorted(glob(pattern))
> if not path.endswith('~')
> and os.path.isfile(path)
> )
> +--
> +2.25.1
> +
> diff --git a/meta/recipes-devtools/python/python3-setuptools_57.0.0.bb
> b/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb
> similarity index 94%
> rename from meta/recipes-devtools/python/python3-setuptools_57.0.0.bb
> rename to meta/recipes-devtools/python/python3-setuptools_57.1.0.bb
> index a15b51e31c..3c7aa4c4c5 100644
> --- a/meta/recipes-devtools/python/python3-setuptools_57.0.0.bb
> +++ b/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb
> @@ -11,7 +11,7 @@ SRC_URI_append_class-native = "
> file://0001-conditionally-do-not-fetch-code-by-e
> SRC_URI += "file://0001-change-shebang-to-python3.patch \
> file://reproducibility.patch"
>
> -SRC_URI[sha256sum] =
> "401cbf33a7bf817d08014d51560fc003b895c4cdc1a5b521ad2969e928a07535"
> +SRC_URI[sha256sum] =
> "cfca9c97e7eebbc8abe18d5e5e962a08dcad55bb63afddd82d681de4d22a597b"
>
> DEPENDS += "${PYTHON_PN}"
>
> --
> 2.25.1
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#153653):
https://lists.openembedded.org/g/openembedded-core/message/153653
Mute This Topic: https://lists.openembedded.org/mt/84047336/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
