Skip to contentSkip to conversation

gnome-desktop-testing: upgrade 2018.1 -> 2021.1

PATCH In review wangmy 4 participants 9 messages Jul 7, 2021 – Jul 9, 2021

lore
Share & tools
lore

wangmy

author
#0 lore raw

PATCH 1/1 gnome-desktop-testing: upgrade 2018.1 -> 2021.1

---
 ...esktop-testing_2018.1.bb => gnome-desktop-testing_2021.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/gnome-desktop-testing/{gnome-desktop-testing_2018.1.bb => gnome-desktop-testing_2021.1.bb} (94%)
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb renamed from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb +1 -1
similarity index 94%
rename from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb
rename to meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb
index e5c69c0c46..b82eb8af2e 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9da2ffcf7707dc11151fe007f4"
 
 SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http"
-SRCREV = "4decade67b29ad170fcf3de148e41695fc459f48"
+SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7"
 
 DEPENDS = "glib-2.0"
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/1 python3-importlib-metadata: upgrade 4.6.0 -> 4.6.1

v4.6.1
======

* #327: Deprecation warnings now honor call stack variance on PyPy.

---
 ...ib-metadata_4.6.0.bb => python3-importlib-metadata_4.6.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-importlib-metadata_4.6.0.bb => python3-importlib-metadata_4.6.1.bb} (88%)
meta/recipes-devtools/python/python3-importlib-metadata_4.6.1.bb renamed from meta/recipes-devtools/python/python3-importlib-metadata_4.6.0.bb +1 -1
similarity index 88%
rename from meta/recipes-devtools/python/python3-importlib-metadata_4.6.0.bb
rename to meta/recipes-devtools/python/python3-importlib-metadata_4.6.1.bb
index b9fd2fe59e..7e9604aaf4 100644
@@ -8,7 +8,7 @@ inherit pypi setuptools3
 PYPI_PACKAGE = "importlib_metadata"
 UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/"
 
-SRC_URI[sha256sum] = "4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"
+SRC_URI[sha256sum] = "079ada16b7fc30dfbb5d13399a5113110dab1aa7c2bc62f66af75f0b717c8cac"
 
 S = "${WORKDIR}/importlib_metadata-${PV}"
 
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 1/1 python3-setuptools: upgrade 57.0.0 -> 57.1.0

In reply to wangmy

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.

---
 .../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%)
meta/recipes-devtools/python/python3-setuptools/reproducibility.patch +14 -7
index 149d8ad5ce..fda520658e 100644
@@ -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 <[email protected]>
+Signed-off-by: Wang Mingyu <[email protected]>
+---
+ 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
+
meta/recipes-devtools/python/python3-setuptools_57.1.0.bb renamed from meta/recipes-devtools/python/python3-setuptools_57.0.0.bb +1 -1
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
@@ -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}"
 
Signature · 1 line
2.25.1
#3 lore raw

Re: [OE-core] [PATCH] python3-setuptools: upgrade 57.0.0 -> 57.1.0

Seems like reproducibility.patch can actually be removed, as it was accepted upstream?

Alex

Quoted 111 lines · wangmy

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.

---
 .../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

meta/recipes-devtools/python/python3-setuptools/reproducibility.patch +1 -1
@@ -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

meta/recipes-devtools/python/python3-setuptools/reproducibility.patch +0 -0
@@ -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]

meta/recipes-devtools/python/python3-setuptools/reproducibility.patch +13 -6
+Signed-off-by: Wang Mingyu <[email protected]>
+---
+ 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
+
meta/recipes-devtools/python/python3-setuptools_57.1.0.bb renamed from meta/recipes-devtools/python/python3-setuptools_57.0.0.bb +0 -0
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
@@ -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

#4 lore raw

Re: [OE-core] [PATCH] python3-setuptools: upgrade 57.0.0 -> 57.1.0

Quoted 1 line · Alexander Kanavin

Seems like reproducibility.patch can actually be removed, as it was accepted upstream?

Yes, upstream tweaked it slightly and we can drop that patch here.

Cheers,

Richard

author
#5 lore raw

PATCH 1/1 u-boot: upgrade 2021.04 -> 2021.07

In reply to wangmy

(Changes of v2021.07)

Processed 1730 csets from 187 developers
29 employers found
A total of 402449 lines added, 82710 removed (delta 319739)

---
 meta/recipes-bsp/u-boot/u-boot-common.inc                       | 2 +-
 .../u-boot/{u-boot-tools_2021.04.bb => u-boot-tools_2021.07.bb} | 0
 .../recipes-bsp/u-boot/{u-boot_2021.04.bb => u-boot_2021.07.bb} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-bsp/u-boot/{u-boot-tools_2021.04.bb => u-boot-tools_2021.07.bb} (100%)
 rename meta/recipes-bsp/u-boot/{u-boot_2021.04.bb => u-boot_2021.07.bb} (100%)
meta/recipes-bsp/u-boot/u-boot-common.inc +1 -1
index dbbb9ff145..6b9253806f 100644
@@ -12,7 +12,7 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "b46dd116ce03e235f2a7d4843c6278e1da44b5e1"
+SRCREV = "840658b093976390e9537724f802281c9c8439f5"
 
 SRC_URI = "git://git.denx.de/u-boot.git \
           "
meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb renamed from meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb +0 -0
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb
rename to meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb
meta/recipes-bsp/u-boot/u-boot_2021.07.bb renamed from meta/recipes-bsp/u-boot/u-boot_2021.04.bb +0 -0
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2021.04.bb
rename to meta/recipes-bsp/u-boot/u-boot_2021.07.bb
Signature · 1 line
2.25.1
#6 lore raw
In reply to wangmy

fails to build on mips https://errors.yoctoproject.org/Errors/Details/587476/

Quoted 29 lines · wangmy
---
 ...esktop-testing_2018.1.bb => gnome-desktop-testing_2021.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/gnome-desktop-testing/{gnome-desktop-testing_2018.1.bb => gnome-desktop-testing_2021.1.bb} (94%)
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb renamed from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb +1 -2
similarity index 94%
rename from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb
rename to meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb
index e5c69c0c46..b82eb8af2e 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9da2ffcf7707dc11151fe007f4"
 
 SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http"
-SRCREV = "4decade67b29ad170fcf3de148e41695fc459f48"
+SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7"
 
 DEPENDS = "glib-2.0"
 
--

2.25.1

author
#7 lore raw

I used the default configuration of mips, and the compiler was mips-poky-linux-gcc, which did not reproduce this problem.

The compiler in the log you sent me is mips-yoe-linux-clang.

Could you tell me how I can use this compiler.

  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 57 lines

-----Original Message-----
From: Khem Raj <[email protected]>
Sent: Thursday, July 8, 2021 11:50 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] gnome-desktop-testing: upgrade 2018.1 -> 2021.1

fails to build on mips https://errors.yoctoproject.org/Errors/Details/587476/

Review LIC_FILES_CHKSUM =

Quoted 27 lines · wangmy
---
 ...esktop-testing_2018.1.bb => gnome-desktop-testing_2021.1.bb} | 2
+-
 1 file changed, 1 insertion(+), 1 deletion(-)  rename

meta/recipes-support/gnome-desktop-testing/{gnome-desktop-testing_2018 .1.bb => gnome-desktop-testing_2021.1.bb} (94%)

diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_201 8.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_202 1.1.bb
similarity index 94%
rename from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018. 1.bb rename to meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021. 1.bb
index e5c69c0c46..b82eb8af2e 100644
---
a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_201 8.1.bb
+++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing +++ _2021.1.bb

(quoted diff) +0 -0
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \

Quoted 1 line

file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9 da2ffcf7707dc11151fe007f4"

Quoted 2 lines

SRC_URI =

"git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http"

Quoted 11 lines
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb renamed from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb +1 -2
-SRCREV = "4decade67b29ad170fcf3de148e41695fc459f48"
+SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7"
 
 DEPENDS = "glib-2.0"
 
--

2.25.1

#8 lore raw
Quoted 6 lines · On Thu, Jul 8, 2021 at 11:30 PM [email protected] <[email protected]> wrote:

I used the default configuration of mips, and the compiler was mips-poky-linux-gcc, which did not reproduce this problem.

The compiler in the log you sent me is mips-yoe-linux-clang.

Could you tell me how I can use this compiler.

Yeah, this issue happens when compiling with clang, architecture is not important. you can use meta-clang layer to reproduce it and set TOOLCHAIN = "clang" in local.conf

I have sent a fix for the issue already

Quoted 70 lines

--
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 57 lines

-----Original Message-----
From: Khem Raj <[email protected]>
Sent: Thursday, July 8, 2021 11:50 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] gnome-desktop-testing: upgrade 2018.1 -> 2021.1

fails to build on mips https://errors.yoctoproject.org/Errors/Details/587476/

Review LIC_FILES_CHKSUM =

Quoted 27 lines · wangmy
---
 ...esktop-testing_2018.1.bb => gnome-desktop-testing_2021.1.bb} | 2
+-
 1 file changed, 1 insertion(+), 1 deletion(-)  rename

meta/recipes-support/gnome-desktop-testing/{gnome-desktop-testing_2018 .1.bb => gnome-desktop-testing_2021.1.bb} (94%)

diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_201 8.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_202 1.1.bb
similarity index 94%
rename from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018. 1.bb rename to meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021. 1.bb
index e5c69c0c46..b82eb8af2e 100644
---
a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_201 8.1.bb
+++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing +++ _2021.1.bb

(quoted diff) +0 -0
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \

Quoted 1 line

file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9 da2ffcf7707dc11151fe007f4"

Quoted 2 lines

SRC_URI =

"git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http"

Quoted 11 lines
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb renamed from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb +1 -2
-SRCREV = "4decade67b29ad170fcf3de148e41695fc459f48"
+SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7"
 
 DEPENDS = "glib-2.0"
 
--

2.25.1