Skip to contentSkip to conversation

nfs-utils: upgrade 2.6.1 -> 2.6.2

PATCH In review Alexander Kanavin 4 participants 47 messages Aug 19, 2022 – Aug 25, 2022 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/42 nfs-utils: upgrade 2.6.1 -> 2.6.2

/usr/sbin/rpcctl is written in python, so add it as a separate package with python3 RDEPENDS.

---
 .../nfs-utils/{nfs-utils_2.6.1.bb => nfs-utils_2.6.2.bb} | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.1.bb => nfs-utils_2.6.2.bb} (95%)
meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.2.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.1.bb +7 -2
similarity index 95%
rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.1.bb
rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.2.bb
index bbed5aea59..57aac8c60b 100644
@@ -31,7 +31,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
            file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \
            file://clang-warnings.patch \
            "
-SRC_URI[sha256sum] = "60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df"
+SRC_URI[sha256sum] = "5200873e81c4d610e2462fc262fe18135f2dbe78b7979f95accd159ae64d5011"
 
 # Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
 # pull in the remainder of the dependencies.
@@ -70,7 +70,9 @@ PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper,libdevmap
 # keyutils is available in meta-oe
 PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils,python3-core"
 
-PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats"
+PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-rpcctl ${PN}-stats"
+
+FILES:${PN} += "${nonarch_libdir}/modprobe.d"
 
 CONFFILES:${PN}-client += "${localstatedir}/lib/nfs/etab \
 			   ${localstatedir}/lib/nfs/rmtab \
@@ -90,6 +92,9 @@ RDEPENDS:${PN}-client = "${PN}-mount rpcbind"
 
 FILES:${PN}-mount = "${base_sbindir}/*mount.nfs*"
 
+FILES:${PN}-rpcctl = "${sbindir}/rpcctl"
+RDEPENDS:${PN}-rpcctl = "python3-core"
+
 FILES:${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat ${sbindir}/nfsdclnts"
 RDEPENDS:${PN}-stats = "python3-core"
 
Signature · 1 line
2.30.2
#1 lore raw

PATCH 2/42 tzdata: upgrade 2022a -> 2022b

---
 meta/recipes-extended/timezone/timezone.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-extended/timezone/timezone.inc +3 -3
index cdd1a2ac3c..2b956cf7c0 100644
@@ -6,7 +6,7 @@ SECTION = "base"
 LICENSE = "PD & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
 
-PV = "2022a"
+PV = "2022b"
 
 SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
            http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \
@@ -14,6 +14,6 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz
 
 UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
 
-SRC_URI[tzcode.sha256sum] = "f8575e7e33be9ee265df2081092526b81c80abac3f4a04399ae9d4d91cdadac7"
-SRC_URI[tzdata.sha256sum] = "ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664"
+SRC_URI[tzcode.sha256sum] = "bab20d943e59a3218435f48d868a4e552f18d6d7f3dd128660c5660c80b8a05f"
+SRC_URI[tzdata.sha256sum] = "f590eaf04a395245426c2be4fae71c143aea5cebc11088b7a0a5704461df397d"
 
Signature · 1 line
2.30.2
#2 lore raw

PATCH 3/42 libcgroup: update 2.0.2 -> 3.0.0

In reply to Alexander Kanavin

License-Update: formatting

---
 .../libcgroup/{libcgroup_2.0.2.bb => libcgroup_3.0.0.bb}    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-core/libcgroup/{libcgroup_2.0.2.bb => libcgroup_3.0.0.bb} (81%)
meta/recipes-core/libcgroup/libcgroup_3.0.0.bb renamed from meta/recipes-core/libcgroup/libcgroup_2.0.2.bb +3 -3
similarity index 81%
rename from meta/recipes-core/libcgroup/libcgroup_2.0.2.bb
rename to meta/recipes-core/libcgroup/libcgroup_3.0.0.bb
index 7ade372cae..efd887844d 100644
@@ -5,15 +5,15 @@ in Linux. Control groups allow you to limit, account and isolate resource usage
 (CPU, memory, disk I/O, etc.) of groups of processes."
 SECTION = "libs"
 LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4d794c5d710e5b3547a6cc6a6609a641"
 
 inherit autotools pkgconfig
 
 DEPENDS = "bison-native flex-native"
 
-SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz"
+SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v3.0/${BP}.tar.gz"
 
-SRC_URI[sha256sum] = "8ef63b32e0aff619547dbb8a25e1f6bab152d7c4864795cf915571a5994d0cf8"
+SRC_URI[sha256sum] = "8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd"
 UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/releases/"
 
 DEPENDS:append:libc-musl = " fts "
Signature · 1 line
2.30.2
#3 lore raw

PATCH 4/42 python3-setuptools-rust: update 1.4.1 -> 1.5.1

In reply to Alexander Kanavin

Drop upstreamed patch.

---
 ...92f08b1248dc03862da86915c2745e0ff7ec.patch | 221 ------------------
 ....1.bb => python3-setuptools-rust_1.5.1.bb} |   7 +-
 2 files changed, 4 insertions(+), 224 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-setuptools-rust/8e9892f08b1248dc03862da86915c2745e0ff7ec.patch
 rename meta/recipes-devtools/python/{python3-setuptools-rust_1.4.1.bb => python3-setuptools-rust_1.5.1.bb} (81%)
meta/recipes-devtools/python/python3-setuptools-rust/8e9892f08b1248dc03862da86915c2745e0ff7ec.patch deleted +0 -221
deleted file mode 100644
index 2a531e17aa..0000000000
@@ -1,221 +0,0 @@
-From 8e9892f08b1248dc03862da86915c2745e0ff7ec Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <[email protected]>
-Date: Fri, 15 Jul 2022 10:33:02 -0400
-Subject: [PATCH] build_rust: remove linker handling that broke cross
- compilation
-
-Upstream-Status: Submitted [https://github.com/PyO3/setuptools-rust/pull/269]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- setuptools_rust/build.py | 151 ++-------------------------------------
- 1 file changed, 7 insertions(+), 144 deletions(-)
-
-diff --git a/setuptools_rust/build.py b/setuptools_rust/build.py
-index 4fe594b..e81ed8f 100644
---- a/setuptools_rust/build.py
-+++ b/setuptools_rust/build.py
-@@ -113,23 +113,10 @@ def build_extension(
-         self, ext: RustExtension, forced_target_triple: Optional[str] = None
-     ) -> List["_BuiltModule"]:
- 
--        target_info = self._detect_rust_target(forced_target_triple)
--        if target_info is not None:
--            target_triple = target_info.triple
--            cross_lib = target_info.cross_lib
--            linker = target_info.linker
--            # We're ignoring target_info.linker_args for now because we're not
--            # sure if they will always do the right thing. Might help with some
--            # of the OS-specific logic if it does.
--
--        else:
--            target_triple = None
--            cross_lib = None
--            linker = None
--
-+        target_triple = self._detect_rust_target(forced_target_triple)
-         rustc_cfgs = get_rustc_cfgs(target_triple)
- 
--        env = _prepare_build_environment(cross_lib)
-+        env = _prepare_build_environment()
- 
-         if not os.path.exists(ext.path):
-             raise DistutilsFileError(
-@@ -150,9 +137,6 @@ def build_extension(
- 
-         rustflags = []
- 
--        if linker is not None:
--            rustflags.extend(["-C", "linker=" + linker])
--
-         if ext._uses_exec_binding():
-             command = [self.cargo, "build", "--manifest-path", ext.path, *cargo_args]
- 
-@@ -407,45 +391,12 @@ def _py_limited_api(self) -> _PyLimitedApi:
- 
-     def _detect_rust_target(
-         self, forced_target_triple: Optional[str] = None
--    ) -> Optional["_TargetInfo"]:
-+    ) -> Optional[str]:
-         assert self.plat_name is not None
--        cross_compile_info = _detect_unix_cross_compile_info()
--        if cross_compile_info is not None:
--            cross_target_info = cross_compile_info.to_target_info()
--            if forced_target_triple is not None:
--                if (
--                    cross_target_info is not None
--                    and not cross_target_info.is_compatible_with(forced_target_triple)
--                ):
--                    self.warn(
--                        f"Forced Rust target `{forced_target_triple}` is not "
--                        f"compatible with deduced Rust target "
--                        f"`{cross_target_info.triple}` - the built package "
--                        f" may not import successfully once installed."
--                    )
--
--                # Forcing the target in a cross-compile environment; use
--                # the cross-compile information in combination with the
--                # forced target
--                return _TargetInfo(
--                    forced_target_triple,
--                    cross_compile_info.cross_lib,
--                    cross_compile_info.linker,
--                    cross_compile_info.linker_args,
--                )
--            elif cross_target_info is not None:
--                return cross_target_info
--            else:
--                raise DistutilsPlatformError(
--                    "Don't know the correct rust target for system type "
--                    f"{cross_compile_info.host_type}. Please set the "
--                    "CARGO_BUILD_TARGET environment variable."
--                )
--
--        elif forced_target_triple is not None:
-+        if forced_target_triple is not None:
-             # Automatic target detection can be overridden via the CARGO_BUILD_TARGET
-             # environment variable or --target command line option
--            return _TargetInfo.for_triple(forced_target_triple)
-+            return forced_target_triple
- 
-         # Determine local rust target which needs to be "forced" if necessary
-         local_rust_target = _adjusted_local_rust_target(self.plat_name)
-@@ -457,7 +408,7 @@ def _detect_rust_target(
-             # check for None first to avoid calling to rustc if not needed
-             and local_rust_target != get_rust_host()
-         ):
--            return _TargetInfo.for_triple(local_rust_target)
-+            return local_rust_target
- 
-         return None
- 
-@@ -547,91 +498,6 @@ class _BuiltModule(NamedTuple):
-     path: str
- 
- 
--class _TargetInfo(NamedTuple):
--    triple: str
--    cross_lib: Optional[str]
--    linker: Optional[str]
--    linker_args: Optional[str]
--
--    @staticmethod
--    def for_triple(triple: str) -> "_TargetInfo":
--        return _TargetInfo(triple, None, None, None)
--
--    def is_compatible_with(self, target: str) -> bool:
--        if self.triple == target:
--            return True
--
--        # the vendor field can be ignored, so x86_64-pc-linux-gnu is compatible
--        # with x86_64-unknown-linux-gnu
--        if _replace_vendor_with_unknown(self.triple) == target:
--            return True
--
--        return False
--
--
--class _CrossCompileInfo(NamedTuple):
--    host_type: str
--    cross_lib: Optional[str]
--    linker: Optional[str]
--    linker_args: Optional[str]
--
--    def to_target_info(self) -> Optional[_TargetInfo]:
--        """Maps this cross compile info to target info.
--
--        Returns None if the corresponding target information could not be
--        deduced.
--        """
--        # hopefully an exact match
--        targets = get_rust_target_list()
--        if self.host_type in targets:
--            return _TargetInfo(
--                self.host_type, self.cross_lib, self.linker, self.linker_args
--            )
--
--        # the vendor field can be ignored, so x86_64-pc-linux-gnu is compatible
--        # with x86_64-unknown-linux-gnu
--        without_vendor = _replace_vendor_with_unknown(self.host_type)
--        if without_vendor is not None and without_vendor in targets:
--            return _TargetInfo(
--                without_vendor, self.cross_lib, self.linker, self.linker_args
--            )
--
--        return None
--
--
--def _detect_unix_cross_compile_info() -> Optional["_CrossCompileInfo"]:
--    # See https://github.com/PyO3/setuptools-rust/issues/138
--    # This is to support cross compiling on *NIX, where plat_name isn't
--    # necessarily the same as the system we are running on.  *NIX systems
--    # have more detailed information available in sysconfig. We need that
--    # because plat_name doesn't give us information on e.g., glibc vs musl.
--    host_type = sysconfig.get_config_var("HOST_GNU_TYPE")
--    build_type = sysconfig.get_config_var("BUILD_GNU_TYPE")
--
--    if not host_type or host_type == build_type:
--        # not *NIX, or not cross compiling
--        return None
--
--    if "apple-darwin" in host_type and (build_type and "apple-darwin" in build_type):
--        # On macos and the build and host differ. This is probably an arm
--        # Python which was built on x86_64. Don't try to handle this for now.
--        # (See https://github.com/PyO3/setuptools-rust/issues/192)
--        return None
--
--    stdlib = sysconfig.get_path("stdlib")
--    assert stdlib is not None
--    cross_lib = os.path.dirname(stdlib)
--
--    bldshared = sysconfig.get_config_var("BLDSHARED")
--    if not bldshared:
--        linker = None
--        linker_args = None
--    else:
--        [linker, _, linker_args] = bldshared.partition(" ")
--
--    return _CrossCompileInfo(host_type, cross_lib, linker, linker_args)
--
--
- def _replace_vendor_with_unknown(target: str) -> Optional[str]:
-     """Replaces vendor in the target triple with unknown.
- 
-@@ -644,7 +510,7 @@ def _replace_vendor_with_unknown(target: str) -> Optional[str]:
-     return "-".join(components)
- 
- 
--def _prepare_build_environment(cross_lib: Optional[str]) -> Dict[str, str]:
-+def _prepare_build_environment() -> Dict[str, str]:
-     """Prepares environment variables to use when executing cargo build."""
- 
-     # Make sure that if pythonXX-sys is used, it builds against the current
-@@ -665,9 +531,6 @@ def _prepare_build_environment(cross_lib: Optional[str]) -> Dict[str, str]:
-         }
-     )
- 
--    if cross_lib:
--        env.setdefault("PYO3_CROSS_LIB_DIR", cross_lib)
--
-     env.pop("CARGO", None)
-     return env
- 
meta/recipes-devtools/python/python3-setuptools-rust_1.5.1.bb renamed from meta/recipes-devtools/python/python3-setuptools-rust_1.4.1.bb +4 -3
similarity index 81%
rename from meta/recipes-devtools/python/python3-setuptools-rust_1.4.1.bb
rename to meta/recipes-devtools/python/python3-setuptools-rust_1.5.1.bb
index c63a3f2b52..24a4f4abef 100644
@@ -9,9 +9,10 @@ BUGTRACKER = "https://github.com/PyO3/setuptools-rust/issues"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=011cd92e702dd9e6b1a26157b6fd53f5"
 
-SRC_URI = "https://files.pythonhosted.org/packages/67/08/e1aa2c582c62ac76e4d60f8e454bd3bba933781a06a88b4e38797445822a/setuptools-rust-${PV}.tar.gz \
-           file://8e9892f08b1248dc03862da86915c2745e0ff7ec.patch"
-SRC_URI[sha256sum] = "18ff850831f58ee21d5783825c99fad632da21e47645e9427fd7dec048029e76"
+SRC_URI = "${PYPI_SRC_URI} \
+           https://files.pythonhosted.org/packages/67/08/e1aa2c582c62ac76e4d60f8e454bd3bba933781a06a88b4e38797445822a/setuptools-rust-${PV}.tar.gz \
+           "
+SRC_URI[sha256sum] = "0e05e456645d59429cb1021370aede73c0760e9360bbfdaaefb5bced530eb9d7"
 
 inherit cargo pypi python_setuptools_build_meta
 
Signature · 1 line
2.30.2
#4 lore raw

PATCH 5/42 shadow: update 4.11.1 -> 4.12.1

In reply to Alexander Kanavin

Combine two username relaxing patches into one, rebase, and submit upstream.

---
 ...> 0001-shadow-use-relaxed-usernames.patch} | 47 ++++++++-----------
 .../shadow-4.1.3-dots-in-usernames.patch      | 27 -----------
 meta/recipes-extended/shadow/shadow.inc       |  8 ++--
 .../{shadow_4.11.1.bb => shadow_4.12.1.bb}    |  0
 4 files changed, 23 insertions(+), 59 deletions(-)
 rename meta/recipes-extended/shadow/files/{shadow-relaxed-usernames.patch => 0001-shadow-use-relaxed-usernames.patch} (76%)
 delete mode 100644 meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
 rename meta/recipes-extended/shadow/{shadow_4.11.1.bb => shadow_4.12.1.bb} (100%)
meta/recipes-extended/shadow/files/0001-shadow-use-relaxed-usernames.patch renamed from meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch +20 -27
similarity index 76%
rename from meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch
rename to meta/recipes-extended/shadow/files/0001-shadow-use-relaxed-usernames.patch
index cc833362e9..6c7abcef1d 100644
@@ -1,6 +1,6 @@
-From ca472d6866e545aaa70a70020e3226f236a8aafc Mon Sep 17 00:00:00 2001
-From: Shan Hai <[email protected]>
-Date: Tue, 13 Sep 2016 13:45:46 +0800
+From b182c52d63bea0f08e1befcec5c3797dd97cdef5 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Tue, 16 Aug 2022 13:46:22 +0200
 Subject: [PATCH] shadow: use relaxed usernames
 
 The groupadd from shadow does not allow upper case group names, the
@@ -11,21 +11,21 @@ restrictions to allow the upper case group names, and the relaxation is
 POSIX compliant because POSIX indicate that usernames are composed of
 characters from the portable filename character set [A-Za-z0-9._-].
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/551]
 
 Signed-off-by: Shan Hai <[email protected]>
-
+Signed-off-by: Alexander Kanavin <[email protected]>
 ---
- libmisc/chkname.c  | 30 ++++++++++++++++++------------
+ libmisc/chkname.c  | 29 ++++++++++++++++++-----------
  man/groupadd.8.xml |  6 ------
- man/useradd.8.xml  |  8 +-------
- 3 files changed, 19 insertions(+), 25 deletions(-)
+ man/useradd.8.xml  |  6 ------
+ 3 files changed, 18 insertions(+), 23 deletions(-)
 
 diff --git a/libmisc/chkname.c b/libmisc/chkname.c
-index 90f185c..65762b4 100644
+index cb002a14..c0306c5a 100644
 --- a/libmisc/chkname.c
 +++ b/libmisc/chkname.c
-@@ -55,22 +55,28 @@ static bool is_valid_name (const char *name)
+@@ -32,21 +32,28 @@ static bool is_valid_name (const char *name)
  	}
  
  	/*
@@ -54,7 +54,6 @@ index 90f185c..65762b4 100644
 -		      ( ('0' <= *name) && ('9' >= *name) ) ||
 -		      ('_' == *name) ||
 -		      ('-' == *name) ||
--		      ('.' == *name) ||
 -		      ( ('$' == *name) && ('\0' == *(name + 1)) )
 -		     )) {
 +                if (!(  (*name >= 'a' && *name <= 'z') ||
@@ -67,13 +66,13 @@ index 90f185c..65762b4 100644
  		}
  	}
 diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
-index 1e58f09..d804b61 100644
+index 26671f92..3eacaa09 100644
 --- a/man/groupadd.8.xml
 +++ b/man/groupadd.8.xml
-@@ -272,12 +272,6 @@
- 
-    <refsect1 id='caveats'>
-      <title>CAVEATS</title>
+@@ -63,12 +63,6 @@
+       values from the system. The new group will be entered into the system
+       files as needed.
+     </para>
 -     <para>
 -       Groupnames must start with a lower case letter or an underscore,
 -       followed by lower case letters, digits, underscores, or dashes.
@@ -84,19 +83,10 @@ index 1e58f09..d804b61 100644
         Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long.
       </para>
 diff --git a/man/useradd.8.xml b/man/useradd.8.xml
-index a16d730..c0bd777 100644
+index c7f95b47..e056d141 100644
 --- a/man/useradd.8.xml
 +++ b/man/useradd.8.xml
-@@ -366,7 +366,7 @@
- 	</term>
- 	<listitem>
- 	  <para>
--	    Do no create the user's home directory, even if the system
-+	    Do not create the user's home directory, even if the system
- 	    wide setting from <filename>/etc/login.defs</filename>
- 	    (<option>CREATE_HOME</option>) is set to
- 	    <replaceable>yes</replaceable>.
-@@ -660,12 +660,6 @@
+@@ -691,12 +691,6 @@
        the user account creation request.
      </para>
  
@@ -109,3 +99,6 @@ index a16d730..c0bd777 100644
      <para>
        Usernames may only be up to 32 characters long.
      </para>
+-- 
+2.30.2
+
meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch deleted +0 -27
deleted file mode 100644
index a7bb0a9290..0000000000
@@ -1,27 +0,0 @@
-# commit message copied from openembedded:
-#    commit 246c80637b135f3a113d319b163422f98174ee6c
-#    Author: Khem Raj <[email protected]>
-#    Date:   Wed Jun 9 13:37:03 2010 -0700
-#
-#    shadow-4.1.4.2: Add patches to support dots in login id.
-#    
-#    Signed-off-by: Khem Raj <[email protected]>
-#
-# comment added by Kevin Tian <[email protected]>, 2010-08-11
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <[email protected]>
-
-Index: shadow-4.1.4.2/libmisc/chkname.c
-===================================================================
---- shadow-4.1.4.2.orig/libmisc/chkname.c	2009-04-28 12:14:04.000000000 -0700
-+++ shadow-4.1.4.2/libmisc/chkname.c	2010-06-03 17:43:20.638973857 -0700
-@@ -61,6 +61,7 @@ static bool is_valid_name (const char *n
- 		      ( ('0' <= *name) && ('9' >= *name) ) ||
- 		      ('_' == *name) ||
- 		      ('-' == *name) ||
-+		      ('.' == *name) ||
- 		      ( ('$' == *name) && ('\0' == *(name + 1)) )
- 		     )) {
- 			return false;
meta/recipes-extended/shadow/shadow.inc +3 -5
index f5fdf436f7..fbb1d395ff 100644
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \
 DEPENDS = "virtual/crypt"
 
 UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases"
-SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/v${PV}/${BP}.tar.gz \
-           file://shadow-4.1.3-dots-in-usernames.patch \
+SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.tar.gz \
+           file://0001-shadow-use-relaxed-usernames.patch \
            ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
-           file://shadow-relaxed-usernames.patch \
            file://useradd \
            "
 
@@ -30,8 +29,7 @@ SRC_URI:append:class-native = " \
 SRC_URI:append:class-nativesdk = " \
            file://0001-Disable-use-of-syslog-for-sysroot.patch \
            "
-
-SRC_URI[sha256sum] = "f262089be6a1011d50ec7849e14571b7b2e788334368f3dccb718513f17935ed"
+SRC_URI[sha256sum] = "9fdb73b5d2b44e8ba9fcee1b4493ac75dd5040bda35b9ac8b06570cd192e7ee3"
 
 # Additional Policy files for PAM
 PAM_SRC_URI = "file://pam.d/chfn \
meta/recipes-extended/shadow/shadow_4.12.1.bb renamed from meta/recipes-extended/shadow/shadow_4.11.1.bb +0 -0
similarity index 100%
rename from meta/recipes-extended/shadow/shadow_4.11.1.bb
rename to meta/recipes-extended/shadow/shadow_4.12.1.bb
Signature · 1 line
2.30.2
#5 lore raw

PATCH 6/42 slang: update 2.3.2 -> 2.3.3

In reply to Alexander Kanavin
---
 .../slang/slang/dont-link-to-host.patch       | 23 ++++++++++++---
 .../slang/slang/terminfo_fixes.patch          | 28 +++++++++++++++----
 .../slang/{slang_2.3.2.bb => slang_2.3.3.bb}  |  3 +-
 3 files changed, 43 insertions(+), 11 deletions(-)
 rename meta/recipes-extended/slang/{slang_2.3.2.bb => slang_2.3.3.bb} (95%)
meta/recipes-extended/slang/slang/dont-link-to-host.patch +19 -4
index 42dba0fae4..4b02068991 100644
@@ -1,3 +1,8 @@
+From b4a6e3c8309cff0f2311cd959c5091213b633851 Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+Date: Tue, 7 Feb 2017 14:35:43 +0000
+Subject: [PATCH] slang: rewrite recipe to run autoconf
+
 SLANG_INST_LIB is the location of where slang will end up, but when building for
 packaging this doesn't have DESTDIR appended so can potentially link to the host
 for cross builds and will trigger QA errors.
@@ -7,10 +12,20 @@ As this is obviously wrong, delete it.
 Upstream-Status: Pending
 Signed-off-by: Ross Burton <[email protected]>
 
+---
+ slsh/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/slsh/Makefile.in b/slsh/Makefile.in
-index cba9d81..4c1c370 100644
+index addd343..63a5c9b 100644
 --- a/slsh/Makefile.in
 +++ b/slsh/Makefile.in
-@@ -80 +80 @@ SHELL = /bin/sh
--INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
-+INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
+@@ -77,7 +77,7 @@ SLSYSWRAP_LIB = @LIB_SLSYSWRAP@
+ #----------------------------------------------------------------------------
+ @SET_MAKE@
+ SHELL = /bin/sh
+-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
++INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
+ DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
+  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
+  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' $(SLSYSWRAP_DEF)
meta/recipes-extended/slang/slang/terminfo_fixes.patch +23 -5
index 3ca20a8cab..331b7f02e4 100644
@@ -1,3 +1,8 @@
+From 2a75095638002d37a2f9c7aeb0ec54f271b0a1c4 Mon Sep 17 00:00:00 2001
+From: Joe Slater <[email protected]>
+Date: Tue, 1 Aug 2017 12:36:53 -0700
+Subject: [PATCH] slang: fix terminfo related problems
+
 Do not use the JD_TERMCAP macro since we cannot get the terminfo from
 ncurses pkg-config, but fix the macro to not reference host directories.
 Also add src/test/Makefile.in so that we can use -ltermcap if we want to.
@@ -8,10 +13,18 @@ Upstream-Status: Inappropriate [see above]
 
 Signed-off-by: Joe Slater <[email protected]>
 
+---
+ autoconf/aclocal.m4   |  8 +---
+ autoconf/configure.ac | 11 +++++-
+ src/test/Makefile.in  | 90 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 100 insertions(+), 9 deletions(-)
+ create mode 100644 src/test/Makefile.in
 
+diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
+index b2dfcd3..5f94ed3 100644
 --- a/autoconf/aclocal.m4
 +++ b/autoconf/aclocal.m4
-@@ -506,14 +506,10 @@ then
+@@ -509,15 +509,9 @@ then
  else
     MISC_TERMINFO_DIRS=""
  fi
@@ -19,8 +32,8 @@ Signed-off-by: Joe Slater <[email protected]>
 -                  /usr/lib/terminfo \
 -                  /usr/share/terminfo \
 -                  /usr/share/lib/terminfo \
--		  /usr/local/lib/terminfo"
-+
+-		  /usr/local/lib/terminfo \
+-                  /etc/terminfo /lib/terminfo"
  TERMCAP=-ltermcap
  
 -for terminfo_dir in $JD_Terminfo_Dirs
@@ -28,9 +41,11 @@ Signed-off-by: Joe Slater <[email protected]>
  do
     if test -d $terminfo_dir
     then
+diff --git a/autoconf/configure.ac b/autoconf/configure.ac
+index 8e11e13..9e6402c 100644
 --- a/autoconf/configure.ac
 +++ b/autoconf/configure.ac
-@@ -249,7 +249,14 @@ AC_CHECK_SIZEOF(size_t)
+@@ -250,7 +250,14 @@ AC_CHECK_SIZEOF(size_t)
  JD_CHECK_LONG_LONG
  JD_LARGE_FILE_SUPPORT
  
@@ -46,7 +61,7 @@ Signed-off-by: Joe Slater <[email protected]>
  JD_GCC_WARNINGS
  
  JD_SET_OBJ_SRC_DIR(src)
-@@ -364,7 +371,7 @@ AC_CONFIG_HEADER(src/sysconf.h:src/confi
+@@ -365,7 +372,7 @@ AC_CONFIG_HEADER(src/sysconf.h:src/config.hin)
  dnl AC_CONFIG_SUBDIRS(demo)
  
  AC_OUTPUT(Makefile:autoconf/Makefile.in \
@@ -55,6 +70,9 @@ Signed-off-by: Joe Slater <[email protected]>
    slang.pc:autoconf/slangpc.in \
  )
  
+diff --git a/src/test/Makefile.in b/src/test/Makefile.in
+new file mode 100644
+index 0000000..4b7307f
 --- /dev/null
 +++ b/src/test/Makefile.in
 @@ -0,0 +1,90 @@
meta/recipes-extended/slang/slang_2.3.3.bb renamed from meta/recipes-extended/slang/slang_2.3.2.bb +1 -2
similarity index 95%
rename from meta/recipes-extended/slang/slang_2.3.2.bb
rename to meta/recipes-extended/slang/slang_2.3.3.bb
index 08cc9670dc..05b8aff0f2 100644
@@ -23,8 +23,7 @@ SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \
            file://run-ptest \
           "
 
-SRC_URI[md5sum] = "c2d5a7aa0246627da490be4e399c87cb"
-SRC_URI[sha256sum] = "fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a"
+SRC_URI[sha256sum] = "f9145054ae131973c61208ea82486d5dd10e3c5cdad23b7c4a0617743c8f5a18"
 
 UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/"
 PREMIRRORS:append = " http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/"
Signature · 1 line
2.30.2
#6 lore raw

PATCH 7/42 xz: update 5.2.5 -> 5.2.6

In reply to Alexander Kanavin
---
 .../xz/xz/CVE-2022-1271.patch                 | 96 -------------------
 .../xz/{xz_5.2.5.bb => xz_5.2.6.bb}           |  7 +-
 2 files changed, 2 insertions(+), 101 deletions(-)
 delete mode 100644 meta/recipes-extended/xz/xz/CVE-2022-1271.patch
 rename meta/recipes-extended/xz/{xz_5.2.5.bb => xz_5.2.6.bb} (88%)
meta/recipes-extended/xz/xz/CVE-2022-1271.patch deleted +0 -96
deleted file mode 100644
index e43e73cf12..0000000000
@@ -1,96 +0,0 @@
-From dc932a1e9c0d9f1db71be11a9b82496e3a72f112 Mon Sep 17 00:00:00 2001
-From: Lasse Collin <[email protected]>
-Date: Tue, 29 Mar 2022 19:19:12 +0300
-Subject: [PATCH] xzgrep: Fix escaping of malicious filenames (ZDI-CAN-16587).
-
-Malicious filenames can make xzgrep to write to arbitrary files
-or (with a GNU sed extension) lead to arbitrary code execution.
-
-xzgrep from XZ Utils versions up to and including 5.2.5 are
-affected. 5.3.1alpha and 5.3.2alpha are affected as well.
-This patch works for all of them.
-
-This bug was inherited from gzip's zgrep. gzip 1.12 includes
-a fix for zgrep.
-
-The issue with the old sed script is that with multiple newlines,
-the N-command will read the second line of input, then the
-s-commands will be skipped because it's not the end of the
-file yet, then a new sed cycle starts and the pattern space
-is printed and emptied. So only the last line or two get escaped.
-
-One way to fix this would be to read all lines into the pattern
-space first. However, the included fix is even simpler: All lines
-except the last line get a backslash appended at the end. To ensure
-that shell command substitution doesn't eat a possible trailing
-newline, a colon is appended to the filename before escaping.
-The colon is later used to separate the filename from the grep
-output so it is fine to add it here instead of a few lines later.
-
-The old code also wasn't POSIX compliant as it used \n in the
-replacement section of the s-command. Using \<newline> is the
-POSIX compatible method.
-
-LC_ALL=C was added to the two critical sed commands. POSIX sed
-manual recommends it when using sed to manipulate pathnames
-because in other locales invalid multibyte sequences might
-cause issues with some sed implementations. In case of GNU sed,
-these particular sed scripts wouldn't have such problems but some
-other scripts could have, see:
-
-    info '(sed)Locale Considerations'
-
-This vulnerability was discovered by:
-cleemy desu wayo working with Trend Micro Zero Day Initiative
-
-Thanks to Jim Meyering and Paul Eggert discussing the different
-ways to fix this and for coordinating the patch release schedule
-with gzip.
-
-Upstream-Status: Backport [https://tukaani.org/xz/xzgrep-ZDI-CAN-16587.patch]
-CVE: CVE-2022-1271
-
-Signed-off-by: Ralph Siemsen <[email protected]>
----
- src/scripts/xzgrep.in | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in
-index 9db5c3a..f64dddb 100644
---- a/src/scripts/xzgrep.in
-+++ b/src/scripts/xzgrep.in
-@@ -179,22 +179,26 @@ for i; do
-          { test $# -eq 1 || test $no_filename -eq 1; }; then
-       eval "$grep"
-     else
-+      # Append a colon so that the last character will never be a newline
-+      # which would otherwise get lost in shell command substitution.
-+      i="$i:"
-+
-+      # Escape & \ | and newlines only if such characters are present
-+      # (speed optimization).
-       case $i in
-       (*'
- '* | *'&'* | *'\'* | *'|'*)
--        i=$(printf '%s\n' "$i" |
--            sed '
--              $!N
--              $s/[&\|]/\\&/g
--              $s/\n/\\n/g
--            ');;
-+        i=$(printf '%s\n' "$i" | LC_ALL=C sed 's/[&\|]/\\&/g; $!s/$/\\/');;
-       esac
--      sed_script="s|^|$i:|"
-+
-+      # $i already ends with a colon so don't add it here.
-+      sed_script="s|^|$i|"
- 
-       # Fail if grep or sed fails.
-       r=$(
-         exec 4>&1
--        (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
-+        (eval "$grep" 4>&-; echo $? >&4) 3>&- |
-+            LC_ALL=C sed "$sed_script" >&3 4>&-
-       ) || r=2
-       exit $r
-     fi >&3 5>&-
meta/recipes-extended/xz/xz_5.2.6.bb renamed from meta/recipes-extended/xz/xz_5.2.5.bb +2 -5
similarity index 88%
rename from meta/recipes-extended/xz/xz_5.2.5.bb
rename to meta/recipes-extended/xz/xz_5.2.6.bb
index 720e070f4a..3482622471 100644
@@ -24,11 +24,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=97d554a32881fee0aa283d96e47cb24a \
                     file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \
                     "
 
-SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz \
-           file://CVE-2022-1271.patch \
-           "
-SRC_URI[md5sum] = "0d270c997aff29708c74d53f599ef717"
-SRC_URI[sha256sum] = "f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10"
+SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz"
+SRC_URI[sha256sum] = "a2105abee17bcd2ebd15ced31b4f5eda6e17efd6b10f921a01cda4a44c91b3a0"
 UPSTREAM_CHECK_REGEX = "xz-(?P<pver>\d+(\.\d+)+)\.tar"
 
 CACHED_CONFIGUREVARS += "gl_cv_posix_shell=/bin/sh"
Signature · 1 line
2.30.2
#7 lore raw

PATCH 8/42 gdk-pixbuf: update 2.42.8 -> 2.42.9

In reply to Alexander Kanavin

Disable manpages, as they require rst2man.

---
 .../0001-Add-use_prebuilt_tools-option.patch  | 18 +++++++++--------
 .../gdk-pixbuf/gdk-pixbuf/fatal-loader.patch  | 20 +++++++++----------
 ...-pixbuf_2.42.8.bb => gdk-pixbuf_2.42.9.bb} | 12 +++++++----
 3 files changed, 28 insertions(+), 22 deletions(-)
 rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.42.8.bb => gdk-pixbuf_2.42.9.bb} (91%)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch +10 -8
index a8206a4507..02cc9a2a70 100644
@@ -1,4 +1,4 @@
-From ba73bb0f3d2023839bc3b681c49b7ec1192cceb4 Mon Sep 17 00:00:00 2001
+From f81b60ebcbbfd9548c8aa1e388662c429068d1e3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Sat, 8 May 2021 21:58:54 +0200
 Subject: [PATCH] Add use_prebuilt_tools option
@@ -18,7 +18,7 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  5 files changed, 42 insertions(+), 19 deletions(-)
 
 diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index 8b0590b..7331491 100644
+index 54ff9dd..2e321cf 100644
 --- a/gdk-pixbuf/meson.build
 +++ b/gdk-pixbuf/meson.build
 @@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin
@@ -45,16 +45,18 @@ index 8b0590b..7331491 100644
    # load the installed cache; we always build it by default
    loaders_cache = custom_target('loaders.cache',
 diff --git a/meson.build b/meson.build
-index 7a1409b..0bc73eb 100644
+index 813bd43..a93e6f7 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -403,16 +403,16 @@ subdir('gdk-pixbuf')
+@@ -369,18 +369,18 @@ subdir('gdk-pixbuf')
  # i18n
  subdir('po')
  
 -if not meson.is_cross_build()
 +if not meson.is_cross_build() or get_option('use_prebuilt_tools')
-   subdir('tests')
+   if get_option('tests')
+     subdir('tests')
+   endif
 -  subdir('thumbnailer')
  endif
 +subdir('thumbnailer')
@@ -69,10 +71,10 @@ index 7a1409b..0bc73eb 100644
      gdk_pixbuf_bindir,
      gdk_pixbuf_libdir,
 diff --git a/meson_options.txt b/meson_options.txt
-index 0ee6718..cc29855 100644
+index d198d99..1c899e9 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -49,4 +49,8 @@ option('gio_sniffing',
+@@ -53,4 +53,8 @@ option('gio_sniffing',
         description: 'Perform file type detection using GIO (Unused on MacOS and Windows)',
         type: 'boolean',
         value: true)
@@ -82,7 +84,7 @@ index 0ee6718..cc29855 100644
 +       value: false)
  
 diff --git a/tests/meson.build b/tests/meson.build
-index 7c6cb11..1029e6a 100644
+index 28c2525..d97c02d 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -5,6 +5,12 @@
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch +10 -10
index 25410b11ea..dd580f8162 100644
@@ -1,4 +1,4 @@
-From f00603d58d844422363b896ea7d07aaf48ddaa66 Mon Sep 17 00:00:00 2001
+From b511bd1efb43ffc49c753e309717a242ec686ef1 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 1 Apr 2014 17:23:36 +0100
 Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal
@@ -14,10 +14,10 @@ Signed-off-by: Ross Burton <[email protected]>
  1 file changed, 15 insertions(+), 4 deletions(-)
 
 diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
-index 312aa78..b813d99 100644
+index 1d39b44..2b00815 100644
 --- a/gdk-pixbuf/queryloaders.c
 +++ b/gdk-pixbuf/queryloaders.c
-@@ -212,7 +212,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
+@@ -216,7 +216,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
          g_string_append_c (contents, '\n');
  }
  
@@ -26,7 +26,7 @@ index 312aa78..b813d99 100644
  query_module (GString *contents, const char *dir, const char *file)
  {
          char *path;
-@@ -221,6 +221,7 @@ query_module (GString *contents, const char *dir, const char *file)
+@@ -225,6 +225,7 @@ query_module (GString *contents, const char *dir, const char *file)
          void                    (*fill_vtable)   (GdkPixbufModule *module);
          gpointer fill_info_ptr;
          gpointer fill_vtable_ptr;
@@ -34,7 +34,7 @@ index 312aa78..b813d99 100644
  
          if (g_path_is_absolute (file))
                  path = g_strdup (file);
-@@ -270,10 +271,13 @@ query_module (GString *contents, const char *dir, const char *file)
+@@ -274,10 +275,13 @@ query_module (GString *contents, const char *dir, const char *file)
                                     g_module_error());
                  else
                          g_fprintf (stderr, "Cannot load loader %s\n", path);
@@ -47,8 +47,8 @@ index 312aa78..b813d99 100644
 +        return ret;
  }
  
- #ifdef G_OS_WIN32
-@@ -314,6 +318,7 @@ int main (int argc, char **argv)
+ #if defined(G_OS_WIN32) && defined(GDK_PIXBUF_RELOCATABLE)
+@@ -318,6 +322,7 @@ int main (int argc, char **argv)
          gint first_file = 1;
          GFile *pixbuf_libdir_file;
          gchar *pixbuf_libdir;
@@ -56,7 +56,7 @@ index 312aa78..b813d99 100644
  
  #ifdef G_OS_WIN32
          gchar *libdir;
-@@ -452,7 +457,9 @@ int main (int argc, char **argv)
+@@ -456,7 +461,9 @@ int main (int argc, char **argv)
                  }
                  modules = g_list_sort (modules, (GCompareFunc)strcmp);
                  for (l = modules; l != NULL; l = l->next)
@@ -67,7 +67,7 @@ index 312aa78..b813d99 100644
                  g_list_free_full (modules, g_free);
                  g_free (moduledir);
  #else
-@@ -468,7 +475,8 @@ int main (int argc, char **argv)
+@@ -472,7 +479,8 @@ int main (int argc, char **argv)
                          infilename = g_locale_to_utf8 (infilename,
                                                         -1, NULL, NULL, NULL);
  #endif
@@ -77,7 +77,7 @@ index 312aa78..b813d99 100644
                  }
                  g_free (cwd);
          }
-@@ -486,5 +494,8 @@ int main (int argc, char **argv)
+@@ -490,5 +498,8 @@ int main (int argc, char **argv)
  
          g_free (pixbuf_libdir);
  
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.9.bb renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.8.bb +8 -4
similarity index 91%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.8.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.9.bb
index fb6829a7d1..d33718e3ea 100644
@@ -23,7 +23,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://0001-Add-use_prebuilt_tools-option.patch \
            "
 
-SRC_URI[sha256sum] = "84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6"
+SRC_URI[sha256sum] = "28f7958e7bf29a32d4e963556d241d0a41a6786582ff6a5ad11665e0347fc962"
 
 inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package
 
@@ -44,11 +44,13 @@ PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
 PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff"
 PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
 
-EXTRA_OEMESON:class-target = " \
+EXTRA_OEMESON = "-Dman=false"
+
+EXTRA_OEMESON:append:class-target = " \
     -Duse_prebuilt_tools=true \
 "
 
-EXTRA_OEMESON:class-nativesdk = " \
+EXTRA_OEMESON:append:class-nativesdk = " \
     -Duse_prebuilt_tools=true \
 "
 
@@ -95,9 +97,11 @@ do_install:append() {
 
 }
 
-# Remove a bad fuzzing attempt that sporadically fails without a way to reproduce
 do_install_ptest() {
+        # Remove a bad fuzzing attempt that sporadically fails without a way to reproduce
 	rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-randomly-modified.test
+        # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215
+	rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-jpeg.test
 }
 
 do_install:append:class-native() {
Signature · 1 line
2.30.2
#8 lore raw

PATCH 9/42 xorgproto: update 2022.1 -> 2022.2

In reply to Alexander Kanavin
---
 .../xorg-proto/{xorgproto_2022.1.bb => xorgproto_2022.2.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-proto/{xorgproto_2022.1.bb => xorgproto_2022.2.bb} (84%)
meta/recipes-graphics/xorg-proto/xorgproto_2022.2.bb renamed from meta/recipes-graphics/xorg-proto/xorgproto_2022.1.bb +2 -2
similarity index 84%
rename from meta/recipes-graphics/xorg-proto/xorgproto_2022.1.bb
rename to meta/recipes-graphics/xorg-proto/xorgproto_2022.2.bb
index a1e852b9eb..a1cd66c744 100644
@@ -8,8 +8,8 @@ SECTION = "x11/libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=dfc4bd2b0568b31725b85b0604e69b56"
 
-SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "1d2dcc66963f234d2c1e1f8d98a0d3e8725149cdac0a263df4097593c48bc2a6"
+SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.xz"
+SRC_URI[sha256sum] = "5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e"
 
 inherit meson
 
Signature · 1 line
2.30.2
#9 lore raw

PATCH 10/42 boost-build-native: update 4.4.1 -> 1.80.0

In reply to Alexander Kanavin

Due to the changed versioned scheme, we have missed a few versions, and latest boost finally detects that.

---
 ...st-build-native_4.4.1.bb => boost-build-native_1.80.0.bb} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-support/boost/{boost-build-native_4.4.1.bb => boost-build-native_1.80.0.bb} (83%)
meta/recipes-support/boost/boost-build-native_1.80.0.bb renamed from meta/recipes-support/boost/boost-build-native_4.4.1.bb +3 -2
similarity index 83%
rename from meta/recipes-support/boost/boost-build-native_4.4.1.bb
rename to meta/recipes-support/boost/boost-build-native_1.80.0.bb
index de566eeb82..54c0b2064f 100644
@@ -7,9 +7,10 @@ LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
 SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master"
-SRCREV = "76da80f33187a3d9e5336157cdfae12ce82e37eb"
+SRCREV = "405d34a04d29519625c5edfe1f3bac3bc3dc3534"
+PE = "1"
 
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+){2,}))"
+UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))"
 
 inherit native
 
Signature · 1 line
2.30.2
#10 lore raw

PATCH 11/42 boost: update 1.79.0 -> 1.80.0

In reply to Alexander Kanavin

Drop boost-CVE-2012-2677.patch; fixed upstream after 10 years:
https://github.com/boostorg/pool/pull/42

---
 .../{boost-1.79.0.inc => boost-1.80.0.inc}    |   2 +-
 ...h-instruction-set-flags-we-do-that-o.patch |  19 ++-
 .../boost/boost/boost-CVE-2012-2677.patch     | 112 ------------------
 .../{boost_1.79.0.bb => boost_1.80.0.bb}      |   3 +-
 4 files changed, 16 insertions(+), 120 deletions(-)
 rename meta/recipes-support/boost/{boost-1.79.0.inc => boost-1.80.0.inc} (90%)
 delete mode 100644 meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch
 rename meta/recipes-support/boost/{boost_1.79.0.bb => boost_1.80.0.bb} (73%)
meta/recipes-support/boost/boost-1.80.0.inc renamed from meta/recipes-support/boost/boost-1.79.0.inc +1 -1
similarity index 90%
rename from meta/recipes-support/boost/boost-1.79.0.inc
rename to meta/recipes-support/boost/boost-1.80.0.inc
index f90c463931..3ee82eb9b2 100644
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
 SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2"
-SRC_URI[sha256sum] = "475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39"
+SRC_URI[sha256sum] = "1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0"
 
 UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
 UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +14 -5
index 67d5dff125..4fe15741bf 100644
@@ -1,4 +1,4 @@
-From 4d2a8fc8117e56bc283349e5f7f889ebbfc55c71 Mon Sep 17 00:00:00 2001
+From 21ba558abe074e7d49bdc931018ce2138e6e8eb5 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Tue, 18 Dec 2018 15:42:57 +0100
 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
@@ -10,14 +10,14 @@ Signed-off-by: Christopher Larson <[email protected]>
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
- tools/build/src/tools/gcc.jam | 144 ----------------------------------
- 1 file changed, 144 deletions(-)
+ tools/build/src/tools/gcc.jam | 153 ----------------------------------
+ 1 file changed, 153 deletions(-)
 
 diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
-index 47a113223..d77525724 100644
+index 726555369..5c5f8ba91 100644
 --- a/tools/build/src/tools/gcc.jam
 +++ b/tools/build/src/tools/gcc.jam
-@@ -1122,147 +1122,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
+@@ -1124,156 +1124,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
          <architecture>$(architecture)/<instruction-set>$(instruction-set)
          : $(values) ;
  }
@@ -72,6 +72,9 @@ index 47a113223..d77525724 100644
 -cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ;
 -cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ;
 -cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ;
+-cpu-flags gcc OPTIONS : x86 : rocketlake : -march=rocketlake ;
+-cpu-flags gcc OPTIONS : x86 : alderlake : -march=alderlake ;
+-cpu-flags gcc OPTIONS : x86 : sapphirerapids : -march=sapphirerapids ;
 -cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
 -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
 -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
@@ -98,6 +101,7 @@ index 47a113223..d77525724 100644
 -cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
 -cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
 -cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ;
+-cpu-flags gcc OPTIONS : x86 : znver3 : -march=znver3 ;
 -cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
 -cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
 -cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
@@ -165,3 +169,8 @@ index 47a113223..d77525724 100644
 -cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ;
 -# AIX variant of RS/6000 & PowerPC
 -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
+-
+-# Enable response file control
+-toolset.flags gcc RESPONSE_FILE_SUB <response-file>auto : a ;
+-toolset.flags gcc RESPONSE_FILE_SUB <response-file>file : f ;
+-toolset.flags gcc RESPONSE_FILE_SUB <response-file>contents : c ;
meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch deleted +0 -112

112 lines not on this page · raw message

meta/recipes-support/boost/boost_1.80.0.bb renamed from meta/recipes-support/boost/boost_1.79.0.bb +1 -2
similarity index 73%
rename from meta/recipes-support/boost/boost_1.79.0.bb
rename to meta/recipes-support/boost/boost_1.80.0.bb
index 09e2556790..c34ab7d703 100644
@@ -1,8 +1,7 @@
 require boost-${PV}.inc
 require boost.inc
 
-SRC_URI += "file://boost-CVE-2012-2677.patch \
-           file://boost-math-disable-pch-for-gcc.patch \
+SRC_URI += "file://boost-math-disable-pch-for-gcc.patch \
            file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
            file://0001-dont-setup-compiler-flags-m32-m64.patch \
            file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \
Signature · 1 line
2.30.2
#11 lore raw

PATCH 12/42 vulkan-samples: update to latest revision

In reply to Alexander Kanavin

Drop upstreamed patch.

---
 ...pp_vulkan_resource.h-add-header-incl.patch | 27 -------------------
 .../vulkan/vulkan-samples_git.bb              |  3 +--
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch
meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch deleted +0 -27
deleted file mode 100644
index c2bb43fe76..0000000000
@@ -1,27 +0,0 @@
-From 8c069a1c4452f626e5bafc547463507d86111319 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 19 Jul 2022 16:55:40 +0200
-Subject: [PATCH] framework/core/hpp_vulkan_resource.h: add header include that
- defines std::exchange
-
-Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/501]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- framework/core/hpp_vulkan_resource.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/framework/core/hpp_vulkan_resource.h b/framework/core/hpp_vulkan_resource.h
-index 0e30f5a..8d83019 100644
---- a/framework/core/hpp_vulkan_resource.h
-+++ b/framework/core/hpp_vulkan_resource.h
-@@ -18,6 +18,7 @@
- #pragma once
- 
- #include <vulkan/vulkan.hpp>
-+#include <utility>
- 
- namespace vkb
- {
--- 
-2.30.2
-
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +1 -2
index 54994c683d..332411b312 100644
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
 SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https \
            file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \
            file://debugfix.patch \
-           file://0001-framework-core-hpp_vulkan_resource.h-add-header-incl.patch \
            file://0001-Qualify-move-as-std-move.patch;patchdir=third_party/spirv-cross \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "ee6c1522af8ba9b56f8416c2eedafb440f681085"
+SRCREV = "74d45aace02d99d766126711a8aaa0978276ca00"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
 S = "${WORKDIR}/git"
Signature · 1 line
2.30.2
#12 lore raw

PATCH 13/42 epiphany: upgrade 42.3 -> 42.4

In reply to Alexander Kanavin
---
 .../epiphany/{epiphany_42.3.bb => epiphany_42.4.bb}             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-gnome/epiphany/{epiphany_42.3.bb => epiphany_42.4.bb} (94%)
meta/recipes-gnome/epiphany/epiphany_42.4.bb renamed from meta/recipes-gnome/epiphany/epiphany_42.3.bb +1 -1
similarity index 94%
rename from meta/recipes-gnome/epiphany/epiphany_42.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_42.4.bb
index f9d60ff2a9..9efd2800da 100644
@@ -28,7 +28,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
            file://migrator.patch \
            file://distributor.patch \
            "
-SRC_URI[archive.sha256sum] = "7316d3c6500e825d8e57293fa58047c56727bee16cd6b6ac804ffe5d9b229560"
+SRC_URI[archive.sha256sum] = "370938ad2920eeb28bc2435944776b7ba55a0e2ede65836f79818cfb7e8f0860"
 
 PACKAGECONFIG_SOUP ?= "soup2"
 PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
Signature · 1 line
2.30.2
#13 lore raw

PATCH 14/42 git: upgrade 2.37.1 -> 2.37.2

In reply to Alexander Kanavin
---
 meta/recipes-devtools/git/{git_2.37.1.bb => git_2.37.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/git/{git_2.37.1.bb => git_2.37.2.bb} (98%)
meta/recipes-devtools/git/git_2.37.2.bb renamed from meta/recipes-devtools/git/git_2.37.1.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/git/git_2.37.1.bb
rename to meta/recipes-devtools/git/git_2.37.2.bb
index 5d2524a1da..b7858e2e46 100644
@@ -165,4 +165,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "7dded96a52e7996ce90dd74a187aec175737f680dc063f3f33c8932cf5c8d809"
+SRC_URI[tarball.sha256sum] = "4c428908e3a2dca4174df6ef49acc995a4fdb1b45205a2c79794487a33bc06e5"
Signature · 1 line
2.30.2
#14 lore raw

PATCH 15/42 glib-networking: upgrade 2.72.1 -> 2.72.2

In reply to Alexander Kanavin
---
 .../{glib-networking_2.72.1.bb => glib-networking_2.72.2.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/glib-networking/{glib-networking_2.72.1.bb => glib-networking_2.72.2.bb} (93%)
meta/recipes-core/glib-networking/glib-networking_2.72.2.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.72.1.bb +1 -1
similarity index 93%
rename from meta/recipes-core/glib-networking/glib-networking_2.72.1.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.72.2.bb
index 41f18d1c48..746d1bc39c 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SECTION = "libs"
 DEPENDS = "glib-2.0"
 
-SRC_URI[archive.sha256sum] = "6fc1bedc8062484dc8a0204965995ef2367c3db5c934058ff1607e5a24d95a74"
+SRC_URI[archive.sha256sum] = "cd2a084c7bb91d78e849fb55d40e472f6d8f6862cddc9f12c39149359ba18268"
 
 PACKAGECONFIG ??= "openssl ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
 
Signature · 1 line
2.30.2
#15 lore raw

PATCH 16/42 gnu-efi: upgrade 3.0.14 -> 3.0.15

In reply to Alexander Kanavin

Drop lib-Makefile-fix-parallel-issue.patch
as issue fixed upstream.

---
 .../lib-Makefile-fix-parallel-issue.patch     | 38 -------------------
 .../gnu-efi/parallel-make-archives.patch      | 17 +++++----
 .../{gnu-efi_3.0.14.bb => gnu-efi_3.0.15.bb}  |  3 +-
 3 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
 rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.14.bb => gnu-efi_3.0.15.bb} (94%)
meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch deleted +0 -38
deleted file mode 100644
index dc00b8fa4d..0000000000
@@ -1,38 +0,0 @@
-From 3ec8c2a70304eabd5760937a4ec3fbc4068a77ed Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Thu, 23 Apr 2015 01:49:31 -0700
-Subject: [PATCH 2/3] lib/Makefile: fix parallel issue
-
-Fixed:
-Assembler messages:
-Fatal error: can't create runtime/rtlock.o: No such file or directory
-Assembler messages:
-Fatal error: can't create runtime/rtdata.o: No such file or directory
-Assembler messages:
-Fatal error: can't create runtime/vm.o: No such file or directory
-Assembler messages:
-Fatal error: can't create runtime/efirtlib.o: No such file or directory
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <[email protected]>
----
- lib/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 048751a..ed39bbb 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -74,6 +74,8 @@ all: libsubdirs libefi.a
- libsubdirs:
- 	for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
- 
-+$(OBJS): libsubdirs
-+
- libefi.a: $(OBJS)
- 	$(AR) $(ARFLAGS) $@ $(OBJS)
- 
--- 
-2.7.4
-
meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch +9 -8
index 8a0138bbe5..63d9b6fc31 100644
@@ -1,7 +1,7 @@
-From 48b2cdbcd761105e8ebad412fcbf23db1ac4ef7c Mon Sep 17 00:00:00 2001
+From f56ddb00a656af2e84f839738fad19909ac65047 Mon Sep 17 00:00:00 2001
 From: Saul Wold <[email protected]>
 Date: Sun, 9 Mar 2014 15:22:15 +0200
-Subject: [PATCH 1/3] Fix parallel make failure for archives
+Subject: [PATCH] Fix parallel make failure for archives
 
 Upstream-Status: Pending
 
@@ -20,12 +20,16 @@ Signed-off-by: California Sullivan <[email protected]>
 [Rebased for 3.0.8]
 Signed-off-by: Yi Zhao <[email protected]>
 
+---
+ lib/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/lib/Makefile b/lib/Makefile
-index 0e6410d..048751a 100644
+index 1fc6a47..54b0ca7 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -75,7 +75,7 @@ libsubdirs:
- 	for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
+@@ -77,7 +77,7 @@ libsubdirs:
+ $(OBJS): libsubdirs
  
  libefi.a: $(OBJS)
 -	$(AR) $(ARFLAGS) $@ $^
@@ -33,6 +37,3 @@ index 0e6410d..048751a 100644
  
  clean:
  	rm -f libefi.a *~ $(OBJS) */*.o
--- 
-2.7.4
-
meta/recipes-bsp/gnu-efi/gnu-efi_3.0.15.bb renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.14.bb +1 -2
similarity index 94%
rename from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.14.bb
rename to meta/recipes-bsp/gnu-efi/gnu-efi_3.0.15.bb
index 36d10354ed..5ae6f391ae 100644
@@ -14,11 +14,10 @@ LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \
            file://parallel-make-archives.patch \
-           file://lib-Makefile-fix-parallel-issue.patch \
            file://gnu-efi-3.0.9-fix-clang-build.patch \
            "
 
-SRC_URI[sha256sum] = "b73b643a0d5697d1f396d7431448e886dd805668789578e3e1a28277c9528435"
+SRC_URI[sha256sum] = "931a257b9c5c1ba65ff519f18373c438a26825f2db7866b163e96d1b168f20ea"
 
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*|riscv64.*)-linux"
 COMPATIBLE_HOST:armv4 = 'null'
Signature · 1 line
2.30.2
#16 lore raw

PATCH 17/42 gpgme: upgrade 1.17.1 -> 1.18.0

In reply to Alexander Kanavin
---
 .../gpgme/gpgme/0001-pkgconfig.patch           | 18 ++++++++----------
 .../gpgme/{gpgme_1.17.1.bb => gpgme_1.18.0.bb} |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)
 rename meta/recipes-support/gpgme/{gpgme_1.17.1.bb => gpgme_1.18.0.bb} (97%)
meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +8 -10
index 35c6b4056c..3b2f59c2fc 100644
@@ -1,4 +1,4 @@
-From 98ce65902b197faa8f660564613ca2e504c2f8f8 Mon Sep 17 00:00:00 2001
+From 0d7ec5b98dc6cbd35f56deaecec5ecfdaa944aee Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Fri, 10 May 2019 14:23:55 +0800
 Subject: [PATCH] pkgconfig
@@ -15,6 +15,7 @@ Rebase to 1.13.0
 Signed-off-by: Hongxu Jia <[email protected]>
 Rebase to 1.17.0
 Signed-off-by: Wang Mingyu <[email protected]>
+
 ---
  configure.ac            |   1 +
  src/Makefile.am         |   4 +-
@@ -25,10 +26,10 @@ Signed-off-by: Wang Mingyu <[email protected]>
  create mode 100644 src/gpgme-pthread.pc.in
 
 diff --git a/configure.ac b/configure.ac
-index 80ce79c..d7c0ac1 100644
+index 9d696b9..5b4e730 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -905,6 +905,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
+@@ -926,6 +926,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
                  src/gpgme-glib.pc
                  src/gpgme.h)
  AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -37,7 +38,7 @@ index 80ce79c..d7c0ac1 100644
  AC_CONFIG_FILES(lang/cpp/tests/Makefile)
  AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in)
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 39c341f..3aca716 100644
+index 67805a8..d38ba02 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -20,11 +20,11 @@
@@ -52,8 +53,8 @@ index 39c341f..3aca716 100644
 -	     gpgme.pc.in gpgme-glib.pc.in
 +	     gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in
  
- bin_SCRIPTS = gpgme-config
- m4datadir = $(datadir)/aclocal
+ if USE_GPGRT_CONFIG
+ noinst_SCRIPTS = gpgme-config
 diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in
 new file mode 100644
 index 0000000..074bbf6
@@ -76,7 +77,7 @@ index 0000000..074bbf6
 +Cflags: -I${includedir}
 +Requires: libassuan gpg-error
 diff --git a/src/gpgme.m4 b/src/gpgme.m4
-index 71b0010..30ec151 100644
+index 71b0010..5821895 100644
 --- a/src/gpgme.m4
 +++ b/src/gpgme.m4
 @@ -79,7 +79,7 @@ dnl config script does not match the host specification the script
@@ -287,6 +288,3 @@ index 80d59de..932645b 100644
 +Cflags: -I${includedir}
 +Libs: -L${libdir} -lgpgme
  URL: https://www.gnupg.org/software/gpgme/index.html
--- 
-2.25.1
-
meta/recipes-support/gpgme/gpgme_1.18.0.bb renamed from meta/recipes-support/gpgme/gpgme_1.17.1.bb +1 -1
similarity index 97%
rename from meta/recipes-support/gpgme/gpgme_1.17.1.bb
rename to meta/recipes-support/gpgme/gpgme_1.18.0.bb
index d95ed6c299..ca9c6cab14 100644
@@ -23,7 +23,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
            file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \
            "
 
-SRC_URI[sha256sum] = "711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f"
+SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e"
 
 DEPENDS = "libgpg-error libassuan"
 RDEPENDS:${PN}-cpp += "libstdc++"
Signature · 1 line
2.30.2
#17 lore raw

PATCH 18/42 libjpeg-turbo: upgrade 2.1.3 -> 2.1.4

In reply to Alexander Kanavin
---
 .../jpeg/{libjpeg-turbo_2.1.3.bb => libjpeg-turbo_2.1.4.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.1.3.bb => libjpeg-turbo_2.1.4.bb} (97%)
meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.3.bb +1 -1
similarity index 97%
rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.3.bb
rename to meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb
index fdc035d5f7..1708fa97f0 100644
@@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://0001-libjpeg-turbo-fix-package_qa-error.patch \
            "
 
-SRC_URI[sha256sum] = "467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0"
+SRC_URI[sha256sum] = "d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b"
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
 UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
 
Signature · 1 line
2.30.2
#18 lore raw

PATCH 19/42 libwebp: upgrade 1.2.3 -> 1.2.4

In reply to Alexander Kanavin
---
 .../webp/{libwebp_1.2.3.bb => libwebp_1.2.4.bb}                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/webp/{libwebp_1.2.3.bb => libwebp_1.2.4.bb} (95%)
meta/recipes-multimedia/webp/libwebp_1.2.4.bb renamed from meta/recipes-multimedia/webp/libwebp_1.2.3.bb +1 -1
similarity index 95%
rename from meta/recipes-multimedia/webp/libwebp_1.2.3.bb
rename to meta/recipes-multimedia/webp/libwebp_1.2.4.bb
index 2d523df749..263589846a 100644
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \
                     file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7"
 
 SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz"
-SRC_URI[sha256sum] = "f5d7ab2390b06b8a934a4fc35784291b3885b557780d099bd32f09241f9d83f9"
+SRC_URI[sha256sum] = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df"
 
 UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html"
 
Signature · 1 line
2.30.2
#19 lore raw

PATCH 20/42 lighttpd: upgrade 1.4.65 -> 1.4.66

In reply to Alexander Kanavin
---
 .../lighttpd/{lighttpd_1.4.65.bb => lighttpd_1.4.66.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.65.bb => lighttpd_1.4.66.bb} (97%)
meta/recipes-extended/lighttpd/lighttpd_1.4.66.bb renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.65.bb +1 -1
similarity index 97%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.65.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.66.bb
index 10aa27f072..801162867c 100644
@@ -19,7 +19,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
            file://lighttpd \
            "
 
-SRC_URI[sha256sum] = "bf0fa68a629fbc404023a912b377e70049331d6797bcbb4b3e8df4c3b42328be"
+SRC_URI[sha256sum] = "47ac6e60271aa0196e65472d02d019556dc7c6d09df3b65df2c1ab6866348e3b"
 
 DEPENDS = "virtual/crypt"
 
Signature · 1 line
2.30.2
#20 lore raw

PATCH 21/42 mesa: upgrade 22.1.5 -> 22.1.6

In reply to Alexander Kanavin
---
 .../mesa/{mesa-gl_22.1.5.bb => mesa-gl_22.1.6.bb}               | 0
 meta/recipes-graphics/mesa/mesa.inc                             | 2 +-
 meta/recipes-graphics/mesa/{mesa_22.1.5.bb => mesa_22.1.6.bb}   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_22.1.5.bb => mesa-gl_22.1.6.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_22.1.5.bb => mesa_22.1.6.bb} (100%)
meta/recipes-graphics/mesa/mesa-gl_22.1.6.bb renamed from meta/recipes-graphics/mesa/mesa-gl_22.1.5.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_22.1.5.bb
rename to meta/recipes-graphics/mesa/mesa-gl_22.1.6.bb
meta/recipes-graphics/mesa/mesa.inc +1 -1
index fccf14a7d1..c4efc13438 100644
@@ -25,7 +25,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \
            "
 
-SRC_URI[sha256sum] = "6fd60d38efdd25317948c61494b5117e01d42da695278728b1faef9f5f9a47ba"
+SRC_URI[sha256sum] = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
meta/recipes-graphics/mesa/mesa_22.1.6.bb renamed from meta/recipes-graphics/mesa/mesa_22.1.5.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_22.1.5.bb
rename to meta/recipes-graphics/mesa/mesa_22.1.6.bb
Signature · 1 line
2.30.2
#21 lore raw

PATCH 22/42 meson: upgrade 0.63.0 -> 0.63.1

In reply to Alexander Kanavin
---
 .../recipes-devtools/meson/{meson_0.63.0.bb => meson_0.63.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/meson/{meson_0.63.0.bb => meson_0.63.1.bb} (98%)
meta/recipes-devtools/meson/meson_0.63.1.bb renamed from meta/recipes-devtools/meson/meson_0.63.0.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/meson/meson_0.63.0.bb
rename to meta/recipes-devtools/meson/meson_0.63.1.bb
index 890f47506f..7f77a7de34 100644
@@ -17,7 +17,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-is_debianlike-always-return-False.patch \
            file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \
            "
-SRC_URI[sha256sum] = "3b51d451744c2bc71838524ec8d96cd4f8c4793d5b8d5d0d0a9c8a4f7c94cd6f"
+SRC_URI[sha256sum] = "06fe13297213d6ff0121c5d5aab25a56ef938ffec57414ed6086fda272cb65e9"
 
 UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
 UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.30.2
#22 lore raw

PATCH 23/42 mpg123: upgrade 1.30.1 -> 1.30.2

In reply to Alexander Kanavin
---
 .../mpg123/{mpg123_1.30.1.bb => mpg123_1.30.2.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.30.1.bb => mpg123_1.30.2.bb} (96%)
meta/recipes-multimedia/mpg123/mpg123_1.30.2.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.30.1.bb +1 -1
similarity index 96%
rename from meta/recipes-multimedia/mpg123/mpg123_1.30.1.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.30.2.bb
index 502d9d114c..f40bff1ff6 100644
@@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "1b20c9c751bea9be556749bd7f97cf580f52ed11f2540756e9af26ae036e4c59"
+SRC_URI[sha256sum] = "c7ea863756bb79daed7cba2942ad3b267a410f26d2dfbd9aaf84451ff28a05d7"
 
 UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
 
Signature · 1 line
2.30.2
#23 lore raw

PATCH 24/42 pango: upgrade 1.50.8 -> 1.50.9

In reply to Alexander Kanavin
---
 .../recipes-graphics/pango/{pango_1.50.8.bb => pango_1.50.9.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/pango/{pango_1.50.8.bb => pango_1.50.9.bb} (94%)
meta/recipes-graphics/pango/pango_1.50.9.bb renamed from meta/recipes-graphics/pango/pango_1.50.8.bb +1 -1
similarity index 94%
rename from meta/recipes-graphics/pango/pango_1.50.8.bb
rename to meta/recipes-graphics/pango/pango_1.50.9.bb
index 936526799f..03e2ca6721 100644
@@ -24,7 +24,7 @@ SRC_URI += "file://run-ptest \
             file://0001-Skip-running-test-layout-test.patch \
 "
 
-SRC_URI[archive.sha256sum] = "cf626f59dd146c023174c4034920e9667f1d25ac2c1569516d63136c311255fa"
+SRC_URI[archive.sha256sum] = "1b636aabf905130d806372136f5e137b6a27f26d47defd9240bf444f6a4fe610"
 
 DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
 
Signature · 1 line
2.30.2
#24 lore raw

PATCH 25/42 piglit: upgrade to latest revision

In reply to Alexander Kanavin
---
 meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/piglit/piglit_git.bb +1 -1
index b1e948ea69..7c1bc89c22 100644
@@ -14,7 +14,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "b95782f470ca2915b0d9b9079f9cd6d81bae092c"
+SRCREV = "6403e90dc7da02d486906cddab8d02c2552a8d46"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
Signature · 1 line
2.30.2
#25 lore raw

PATCH 26/42 pkgconf: upgrade 1.8.0 -> 1.9.2

In reply to Alexander Kanavin
---
 .../pkgconf/{pkgconf_1.8.0.bb => pkgconf_1.9.2.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/pkgconf/{pkgconf_1.8.0.bb => pkgconf_1.9.2.bb} (96%)
meta/recipes-devtools/pkgconf/pkgconf_1.9.2.bb renamed from meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb +1 -1
similarity index 96%
rename from meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb
rename to meta/recipes-devtools/pkgconf/pkgconf_1.9.2.bb
index 887e15e28c..576710b8fc 100644
@@ -20,7 +20,7 @@ SRC_URI = "\
     file://pkg-config-native.in \
     file://pkg-config-esdk.in \
 "
-SRC_URI[sha256sum] = "ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf"
+SRC_URI[sha256sum] = "db6bf5426e0e9fc107042cc85fc62b1f391f1d7af46c4a3c39b7f5b5231dfa09"
 
 inherit autotools
 
Signature · 1 line
2.30.2
#26 lore raw

PATCH 27/42 python3-dtschema: upgrade 2022.8 -> 2022.8.1

In reply to Alexander Kanavin
---
 ...{python3-dtschema_2022.8.bb => python3-dtschema_2022.8.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-dtschema_2022.8.bb => python3-dtschema_2022.8.1.bb} (83%)
meta/recipes-devtools/python/python3-dtschema_2022.8.1.bb renamed from meta/recipes-devtools/python/python3-dtschema_2022.8.bb +1 -1
similarity index 83%
rename from meta/recipes-devtools/python/python3-dtschema_2022.8.bb
rename to meta/recipes-devtools/python/python3-dtschema_2022.8.1.bb
index e8c8ac6f92..38f646e50a 100644
@@ -7,7 +7,7 @@ inherit pypi setuptools3
 
 PYPI_PACKAGE = "dtschema"
 
-SRC_URI[sha256sum] = "1befe7c9f74cea248a8b524cf6185ac48912a5b2aae96854d77cb94584433ca4"
+SRC_URI[sha256sum] = "3e56a9920944223d6f93fd51ada19dd8db554ac9182ef52c1c5c9d4966ab30aa"
 
 DEPENDS += "python3-setuptools-scm-native"
 RDEPENDS:${PN} += "python3-ruamel-yaml python3-jsonschema python3-rfc3987"
Signature · 1 line
2.30.2
#27 lore raw

PATCH 28/42 python3-hypothesis: upgrade 6.54.1 -> 6.54.3

In reply to Alexander Kanavin
---
 ...ython3-hypothesis_6.54.1.bb => python3-hypothesis_6.54.3.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-hypothesis_6.54.1.bb => python3-hypothesis_6.54.3.bb} (91%)
meta/recipes-devtools/python/python3-hypothesis_6.54.3.bb renamed from meta/recipes-devtools/python/python3-hypothesis_6.54.1.bb +1 -1
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.54.1.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.54.3.bb
index afcd5e64ef..7874fed296 100644
@@ -13,7 +13,7 @@ SRC_URI += " \
     file://test_rle.py \
     "
 
-SRC_URI[sha256sum] = "de63c34309181875e71d0f5d1c1051c9320a1fe0517ea6733af8cedf818191f4"
+SRC_URI[sha256sum] = "03749f5e2cb982e54e2a11abcb367b9a260ef8e279387d437145354c080a6bdc"
 
 RDEPENDS:${PN} += " \
     python3-attrs \
Signature · 1 line
2.30.2
#28 lore raw

Re: [OE-core] [PATCH 28/42] python3-hypothesis: upgrade 6.54.1 -> 6.54.3

Hi Alex,

I sent a patch to revert this recipe's version to 6.46, because it was broken since it was upgraded to 6.48. In short, it's trying to use some python3.11 feature and falls back to a module which itself is a backport from python3.11. More details are in the commit message: [OE-core][PATCH] python3-hypothesis: revert back to 6.46.11

Regards,
Qi

Quoted 31 lines · Alexander Kanavin
---
  ...ython3-hypothesis_6.54.1.bb => python3-hypothesis_6.54.3.bb} | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

rename meta/recipes-devtools/python/{python3-hypothesis_6.54.1.bb => python3-hypothesis_6.54.3.bb} (91%)

meta/recipes-devtools/python/python3-hypothesis_6.54.3.bb renamed from meta/recipes-devtools/python/python3-hypothesis_6.54.1.bb +1 -2
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.54.1.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.54.3.bb
index afcd5e64ef..7874fed296 100644
@@ -13,7 +13,7 @@ SRC_URI += " \
      file://test_rle.py  \
      "
 
-SRC_URI[sha256sum] = "de63c34309181875e71d0f5d1c1051c9320a1fe0517ea6733af8cedf818191f4"
+SRC_URI[sha256sum] = "03749f5e2cb982e54e2a11abcb367b9a260ef8e279387d437145354c080a6bdc"
 
  RDEPENDS:${PN} += " \
      python3-attrs \
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#169598):https://lists.openembedded.org/g/openembedded-core/message/169598 Mute This Topic:https://lists.openembedded.org/mt/93120253/3618072
Group Owner:[email protected] Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#29 lore raw

Re: [OE-core] [PATCH 28/42] python3-hypothesis: upgrade 6.54.1 -> 6.54.3

Hello Qi,

no problem, this can be dropped. I'm working on a python 3.11 upgrade now:
https://git.yoctoproject.org/poky-contrib/log/?h=akanavin/python-3.11

The only issue found by AB is a couple failing tests:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/3909/steps/12/logs/stdio

Alex

Quoted 45 lines · ChenQi

Hi Alex,

I sent a patch to revert this recipe's version to 6.46, because it was broken since it was upgraded to 6.48. In short, it's trying to use some python3.11 feature and falls back to a module which itself is a backport from python3.11. More details are in the commit message: [OE-core][PATCH] python3-hypothesis: revert back to 6.46.11

Regards,
Qi

On 8/19/22 15:27, Alexander Kanavin wrote:

---
 ...ython3-hypothesis_6.54.1.bb => python3-hypothesis_6.54.3.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-hypothesis_6.54.1.bb => python3-hypothesis_6.54.3.bb} (91%)
meta/recipes-devtools/python/python3-hypothesis_6.54.3.bb renamed from meta/recipes-devtools/python/python3-hypothesis_6.54.1.bb +1 -2
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.54.1.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.54.3.bb
index afcd5e64ef..7874fed296 100644
@@ -13,7 +13,7 @@ SRC_URI += " \
     file://test_rle.py \
     "
 
-SRC_URI[sha256sum] = "de63c34309181875e71d0f5d1c1051c9320a1fe0517ea6733af8cedf818191f4"
+SRC_URI[sha256sum] = "03749f5e2cb982e54e2a11abcb367b9a260ef8e279387d437145354c080a6bdc"
 
 RDEPENDS:${PN} += " \
     python3-attrs \
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#169598): https://lists.openembedded.org/g/openembedded-core/message/169598
Mute This Topic: https://lists.openembedded.org/mt/93120253/3618072
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#30 lore raw

PATCH 29/42 python3-more-itertools: upgrade 8.13.0 -> 8.14.0

In reply to Alexander Kanavin
---
 ...ore-itertools_8.13.0.bb => python3-more-itertools_8.14.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-more-itertools_8.13.0.bb => python3-more-itertools_8.14.0.bb} (86%)
meta/recipes-devtools/python/python3-more-itertools_8.14.0.bb renamed from meta/recipes-devtools/python/python3-more-itertools_8.13.0.bb +1 -1
similarity index 86%
rename from meta/recipes-devtools/python/python3-more-itertools_8.13.0.bb
rename to meta/recipes-devtools/python/python3-more-itertools_8.14.0.bb
index 94f6f9e4d5..c955f93d9b 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/erikrose/more-itertools"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5"
 
-SRC_URI[sha256sum] = "a42901a0a5b169d925f6f217cd5a190e32ef54360905b9c39ee7db5313bfec0f"
+SRC_URI[sha256sum] = "c09443cd3d5438b8dafccd867a6bc1cb0894389e90cb53d227456b0b0bccb750"
 
 inherit pypi python_flit_core ptest
 
Signature · 1 line
2.30.2
#31 lore raw

PATCH 30/42 python3-numpy: upgrade 1.23.1 -> 1.23.2

In reply to Alexander Kanavin
---
 .../python/{python3-numpy_1.23.1.bb => python3-numpy_1.23.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-numpy_1.23.1.bb => python3-numpy_1.23.2.bb} (96%)
meta/recipes-devtools/python/python3-numpy_1.23.2.bb renamed from meta/recipes-devtools/python/python3-numpy_1.23.1.bb +1 -1
similarity index 96%
rename from meta/recipes-devtools/python/python3-numpy_1.23.1.bb
rename to meta/recipes-devtools/python/python3-numpy_1.23.2.bb
index 67ab1d9298..960dcf9410 100644
@@ -13,7 +13,7 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
            file://run-ptest \
            file://0001-generate_umath.py-do-not-write-full-path-to-output-f.patch \
            "
-SRC_URI[sha256sum] = "d748ef349bfef2e1194b59da37ed5a29c19ea8d7e6342019921ba2ba4fd8b624"
+SRC_URI[sha256sum] = "b78d00e48261fbbd04aa0d7427cf78d18401ee0abd89c7559bbf422e5b1c7d01"
 
 UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.30.2
#32 lore raw

PATCH 31/42 python3-pbr: upgrade 5.9.0 -> 5.10.0

In reply to Alexander Kanavin
---
 meta/recipes-devtools/python/python3-pbr_5.10.0.bb | 4 ++++
 meta/recipes-devtools/python/python3-pbr_5.9.0.bb  | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python3-pbr_5.10.0.bb
 delete mode 100644 meta/recipes-devtools/python/python3-pbr_5.9.0.bb
meta/recipes-devtools/python/python3-pbr_5.10.0.bb new file +4 -0
new file mode 100644
index 0000000000..022f834901
@@ -0,0 +1,4 @@
+inherit setuptools3
+require python-pbr.inc
+
+SRC_URI[sha256sum] = "cfcc4ff8e698256fc17ea3ff796478b050852585aa5bae79ecd05b2ab7b39b9a"
meta/recipes-devtools/python/python3-pbr_5.9.0.bb deleted +0 -4
deleted file mode 100644
index c93b71dbd3..0000000000
@@ -1,4 +0,0 @@
-inherit setuptools3
-require python-pbr.inc
-
-SRC_URI[sha256sum] = "e8dca2f4b43560edef58813969f52a56cef023146cbb8931626db80e6c1c4308"
Signature · 1 line
2.30.2
#33 lore raw

PATCH 32/42 python3-pyelftools: upgrade 0.28 -> 0.29

In reply to Alexander Kanavin
---
 .../{python3-pyelftools_0.28.bb => python3-pyelftools_0.29.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pyelftools_0.28.bb => python3-pyelftools_0.29.bb} (82%)
meta/recipes-devtools/python/python3-pyelftools_0.29.bb renamed from meta/recipes-devtools/python/python3-pyelftools_0.28.bb +1 -1
similarity index 82%
rename from meta/recipes-devtools/python/python3-pyelftools_0.28.bb
rename to meta/recipes-devtools/python/python3-pyelftools_0.29.bb
index 0ceddcb68a..2199e9ff8e 100644
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5ce2a2b07fca326bc7c146d10105ccfc"
 
-SRC_URI[sha256sum] = "53e5609cac016471d40bd88dc410cd90755942c25e58a61021cfdf7abdfeacff"
+SRC_URI[sha256sum] = "ec761596aafa16e282a31de188737e5485552469ac63b60cfcccf22263fd24ff"
 
 PYPI_PACKAGE = "pyelftools"
 
Signature · 1 line
2.30.2
#34 lore raw

PATCH 33/42 python3-pytz: upgrade 2022.1 -> 2022.2.1

In reply to Alexander Kanavin
---
 .../python/{python3-pytz_2022.1.bb => python3-pytz_2022.2.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pytz_2022.1.bb => python3-pytz_2022.2.1.bb} (89%)
meta/recipes-devtools/python/python3-pytz_2022.2.1.bb renamed from meta/recipes-devtools/python/python3-pytz_2022.1.bb +1 -1
similarity index 89%
rename from meta/recipes-devtools/python/python3-pytz_2022.1.bb
rename to meta/recipes-devtools/python/python3-pytz_2022.2.1.bb
index a4bb4f5c8f..bb7aeeec35 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999"
 
 inherit pypi setuptools3 ptest
 
-SRC_URI[sha256sum] = "1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7"
+SRC_URI[sha256sum] = "cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5"
 
 RDEPENDS:${PN}:class-target += "\
     ${PYTHON_PN}-datetime \
Signature · 1 line
2.30.2
#35 lore raw

PATCH 34/42 strace: upgrade 5.18 -> 5.19

In reply to Alexander Kanavin
---
 meta/recipes-devtools/strace/{strace_5.18.bb => strace_5.19.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/strace/{strace_5.18.bb => strace_5.19.bb} (96%)
meta/recipes-devtools/strace/strace_5.19.bb renamed from meta/recipes-devtools/strace/strace_5.18.bb +1 -1
similarity index 96%
rename from meta/recipes-devtools/strace/strace_5.18.bb
rename to meta/recipes-devtools/strace/strace_5.19.bb
index 75ff58bd50..5e69cfd5f9 100644
@@ -14,7 +14,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://0001-strace-fix-reproducibilty-issues.patch \
            file://skip-load.patch \
            "
-SRC_URI[sha256sum] = "60293ea79ac9253d600cdc9be077ad2988ca22284a439c9e66be5150db3d1187"
+SRC_URI[sha256sum] = "aa3dc1c8e60e4f6ff3d396514aa247f3c7bf719d8a8dc4dd4fa793be786beca3"
 
 inherit autotools ptest
 
Signature · 1 line
2.30.2
#36 lore raw

PATCH 35/42 sysklogd: upgrade 2.4.2 -> 2.4.4

In reply to Alexander Kanavin
---
 .../sysklogd/{sysklogd_2.4.2.bb => sysklogd_2.4.4.bb}           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/sysklogd/{sysklogd_2.4.2.bb => sysklogd_2.4.4.bb} (97%)
meta/recipes-extended/sysklogd/sysklogd_2.4.4.bb renamed from meta/recipes-extended/sysklogd/sysklogd_2.4.2.bb +1 -1
similarity index 97%
rename from meta/recipes-extended/sysklogd/sysklogd_2.4.2.bb
rename to meta/recipes-extended/sysklogd/sysklogd_2.4.4.bb
index 948acbcf59..a19b4f58eb 100644
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/troglobit/sysklogd.git;branch=master;protocol=https
            file://sysklogd \
            "
 
-SRCREV = "78505913888b71b2fa2e8616636fcc430ffa30bb"
+SRCREV = "51d471543ce59eace6df6da0e42658911f1fb8c0"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.30.2
#37 lore raw

PATCH 36/42 webkitgtk: upgrade 2.36.5 -> 2.36.6

In reply to Alexander Kanavin
---
 .../webkit/{webkitgtk_2.36.5.bb => webkitgtk_2.36.6.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.36.5.bb => webkitgtk_2.36.6.bb} (98%)
meta/recipes-sato/webkit/webkitgtk_2.36.6.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.36.5.bb +1 -1
similarity index 98%
rename from meta/recipes-sato/webkit/webkitgtk_2.36.5.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.36.6.bb
index b3fe357010..37b977f9ba 100644
@@ -17,7 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \
            "
 
-SRC_URI[sha256sum] = "d5532fa884c943dc48f1911473dd663aba407a3b35caa7b04bac1419b41e5908"
+SRC_URI[sha256sum] = "1193bc821946336776f0dfa5e0dca5651f1e57157eda12da4721d2441f24a61a"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
Signature · 1 line
2.30.2
#38 lore raw

PATCH 37/42 wireless-regdb: upgrade 2022.06.06 -> 2022.08.12

In reply to Alexander Kanavin
---
 ...ireless-regdb_2022.06.06.bb => wireless-regdb_2022.08.12.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.06.06.bb => wireless-regdb_2022.08.12.bb} (94%)
meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb renamed from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb +1 -1
similarity index 94%
rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb
rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb
index 2eba4f873b..357e79d7e1 100644
@@ -5,7 +5,7 @@ LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
 
 SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "ac00f97efecce5046ed069d1d93f3365fdf994c7c7854a8fc50831e959537230"
+SRC_URI[sha256sum] = "59c8f7d17966db71b27f90e735ee8f5b42ca3527694a8c5e6e9b56bd379c3b84"
 
 inherit bin_package allarch
 
Signature · 1 line
2.30.2
#39 lore raw

PATCH 38/42 wpebackend-fdo: upgrade 1.12.0 -> 1.12.1

In reply to Alexander Kanavin
---
 .../{wpebackend-fdo_1.12.0.bb => wpebackend-fdo_1.12.1.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-sato/webkit/{wpebackend-fdo_1.12.0.bb => wpebackend-fdo_1.12.1.bb} (90%)
meta/recipes-sato/webkit/wpebackend-fdo_1.12.1.bb renamed from meta/recipes-sato/webkit/wpebackend-fdo_1.12.0.bb +1 -1
similarity index 90%
rename from meta/recipes-sato/webkit/wpebackend-fdo_1.12.0.bb
rename to meta/recipes-sato/webkit/wpebackend-fdo_1.12.1.bb
index 4a18467ea4..5f776c13e6 100644
@@ -13,7 +13,7 @@ inherit meson features_check pkgconfig
 REQUIRED_DISTRO_FEATURES = "opengl"
 
 SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "6239c9c15523410798d66315de6b491712ab30009ba180f3e0dd076d9b0074ac"
+SRC_URI[sha256sum] = "45aa833c44ec292f31fa943b01b8cc75e54eb623ad7ba6a66fc2f118fe69e629"
 
 # Especially helps compiling with clang which enable this as error when
 # using c++11
Signature · 1 line
2.30.2
#40 lore raw

PATCH 39/42 rust: update from 1.62.1 to 1.63.0

In reply to Alexander Kanavin

From: Randy MacLeod <[email protected]>

Release notes:
https://blog.rust-lang.org/2022/08/11/Rust-1.63.0.html

This is a standard upgrade aside from the path for the stage2 tools binaries (clippy, et.al.) changing.

---
 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 .../{cargo_1.62.1.bb => cargo_1.63.0.bb}      |  0
 ...ibstd-rs_1.62.1.bb => libstd-rs_1.63.0.bb} |  0
 ....62.1.bb => rust-cross-canadian_1.63.0.bb} |  0
 ...ust-llvm_1.62.1.bb => rust-llvm_1.63.0.bb} |  0
 meta/recipes-devtools/rust/rust-snapshot.inc  | 24 +++++++++----------
 meta/recipes-devtools/rust/rust-source.inc    |  2 +-
 .../rust/{rust_1.62.1.bb => rust_1.63.0.bb}   |  4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)
 rename meta/recipes-devtools/cargo/{cargo_1.62.1.bb => cargo_1.63.0.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.62.1.bb => libstd-rs_1.63.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.62.1.bb => rust-cross-canadian_1.63.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.62.1.bb => rust-llvm_1.63.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust_1.62.1.bb => rust_1.63.0.bb} (92%)
meta/conf/distro/include/tcmode-default.inc +1 -1
index 31c9dd5065..52d0f7a79f 100644
@@ -27,7 +27,7 @@ GOVERSION ?= "1.19%"
 # This can not use wildcards like 8.0.% since it is also used in mesa to denote
 # llvm version being used, so always bump it with llvm recipe version bump
 LLVMVERSION ?= "14.0.6"
-RUSTVERSION ?= "1.62%"
+RUSTVERSION ?= "1.63%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
meta/recipes-devtools/cargo/cargo_1.63.0.bb renamed from meta/recipes-devtools/cargo/cargo_1.62.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cargo/cargo_1.62.1.bb
rename to meta/recipes-devtools/cargo/cargo_1.63.0.bb
meta/recipes-devtools/rust/libstd-rs_1.63.0.bb renamed from meta/recipes-devtools/rust/libstd-rs_1.62.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.62.1.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.63.0.bb
meta/recipes-devtools/rust/rust-cross-canadian_1.63.0.bb renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.63.0.bb
meta/recipes-devtools/rust/rust-llvm_1.63.0.bb renamed from meta/recipes-devtools/rust/rust-llvm_1.62.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.62.1.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.63.0.bb
meta/recipes-devtools/rust/rust-snapshot.inc +12 -12
index 3bd7b07cef..b9d7edd672 100644
@@ -1,25 +1,25 @@
 ## This is information on the rust-snapshot (binary) used to build our current release.
-## snapshot info is taken from rust/src/stage0.txt
+## snapshot info is taken from rust/src/stage0.json
 ## Rust is self-hosting and bootstraps itself with a pre-built previous version of itself.
 ## The exact (previous) version that has been used is specified in the source tarball.
 ## The version is replicated here.
 ## TODO: find a way to add additional SRC_URIs based on the contents of an
 ##       earlier SRC_URI.
-RS_VERSION = "1.61.0"
-CARGO_VERSION = "1.61.0"
+RS_VERSION = "1.62.0"
+CARGO_VERSION = "1.62.0"
 
 # TODO: Add hashes for other architecture toolchains as well. Make a script?
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "270b07aa5f2de52255a117e1e587138d77375ce0d09a1d7fead085f29b3977e9"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] = "21c4613f389ed130fbaaf88f1e984319f72b5fc10734569a5ba19e22ebb03abd"
-SRC_URI[cargo-snapshot-x86_64.sha256sum] = "9461727d754f865ef2a87479d40bbe4c5176f80963b7c50b7797bc8940d7a0a0"
+SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "addfae87b6b1b521d98a50fdc5120990888a51bb397100062e9c558267c67c77"
+SRC_URI[rustc-snapshot-x86_64.sha256sum] = "e7f71f4ef09334ddc9ec8cbf2f958d654e36f580c95f8fec6d5c816ce256dbd6"
+SRC_URI[cargo-snapshot-x86_64.sha256sum] = "815c63119a9cf0282ff240c6444b6f867238763ee3dea182f10837ae7dbbb1d4"
 
-SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "57d60a519dbce12146849f7e72d55f3cffe9cdcbff8d58e90bb62d3c016bb5c0"
-SRC_URI[rustc-snapshot-aarch64.sha256sum] = "c996de6391e3ea94629fbc09b03bce186fcde345159f43ec95a82c500adb5e94"
-SRC_URI[cargo-snapshot-aarch64.sha256sum] = "a055e6cfd9b5f8938780db6179d2ef92990c714ce64278337d7edf3d29c8ab62"
+SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "dd5df8a92af3e5d49a1122b9561821ebd72a9317884a37ecddae041e652a7563"
+SRC_URI[rustc-snapshot-aarch64.sha256sum] = "0fa320a19d41dcfc592bc006f5e9eda8e3b972598a26c96ad64eedd868516df3"
+SRC_URI[cargo-snapshot-aarch64.sha256sum] = "475038ecacca9ff586cad2082d5d950544b0d581a2a287facc7d899aae488813"
 
-SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "36c0ccff14c80419507561db050f9533f0abd43fc50f3ddb859c10df74b1c351"
-SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "dc54893d747e4f3330515caa75e404f78c6c5475a1216d1428f5e7ce1c2e9602"
-SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "09817011ff1ef4b7006387c7cabb6a059731792a9372533dec7d87e7f014444b"
+SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "d6678b7c971f3adbe7f820adae669d03a314468441e2907747c76eca98e0be92"
+SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "b66d0bc6dbfdc0d4b826f787ec4e772dea8e3d2015cecbe2105632d468c28dcb"
+SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "016257f1641693008068bd086fec66d68550d1778f6aea9d06c9b263fca392d5"
 
 SRC_URI += " \
     https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
meta/recipes-devtools/rust/rust-source.inc +1 -1
index dbcef2cbc2..47bfbe98a7 100644
@@ -1,5 +1,5 @@
 SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
-SRC_URI[rust.sha256sum] = "02066a93c2f6596cc046a897d5716c86e3607c1cd0f54db9a867ae8c8265072e"
+SRC_URI[rust.sha256sum] = "8f44af6dc44cc4146634a4dd5e4cc5470b3052a2337019b870c0e025e8987e0c"
 
 SRC_URI:append:class-target:pn-rust = " file://hardcodepaths.patch"
 SRC_URI:append:class-nativesdk:pn-nativesdk-rust = " file://hardcodepaths.patch"
meta/recipes-devtools/rust/rust_1.63.0.bb renamed from meta/recipes-devtools/rust/rust_1.62.1.bb +2 -2
similarity index 92%
rename from meta/recipes-devtools/rust/rust_1.62.1.bb
rename to meta/recipes-devtools/rust/rust_1.63.0.bb
index 81923c3331..3081cd5ef3 100644
@@ -43,7 +43,7 @@ rust_do_install:class-nativesdk() {
 
     install -d ${D}${bindir}
     for i in cargo-clippy clippy-driver rustfmt; do
-        cp build/${RUST_BUILD_SYS}/stage2-tools-bin/$i ${D}${bindir}
+        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
         chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
     done
 
@@ -60,7 +60,7 @@ rust_do_install:class-target() {
 
     install -d ${D}${bindir}
     for i in cargo-clippy clippy-driver rustfmt; do
-        cp build/${RUST_BUILD_SYS}/stage2-tools-bin/$i ${D}${bindir}
+        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
         chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
     done
 
Signature · 1 line
2.30.2
#41 lore raw

PATCH 1/1 rust: conditionally copy tools like rustfmt

For qemuppc/mips, rustfmt isn't being built so check that it and related tools exist before copying them. qemuppc/mips are not well-supported in the Rust world but will work to get the build to fixed later.

---
 meta/recipes-devtools/rust/rust_1.63.0.bb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
meta/recipes-devtools/rust/rust_1.63.0.bb +8 -4
index 3081cd5ef3..050f398794 100644
@@ -43,8 +43,10 @@ rust_do_install:class-nativesdk() {
 
     install -d ${D}${bindir}
     for i in cargo-clippy clippy-driver rustfmt; do
-        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
-        chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        if [ -e build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ]; then
+            cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
+            chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        fi
     done
 
     chown root:root ${D}/ -R
@@ -60,8 +62,10 @@ rust_do_install:class-target() {
 
     install -d ${D}${bindir}
     for i in cargo-clippy clippy-driver rustfmt; do
-        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
-        chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        if [ -e build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ]; then
+            cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
+            chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        fi
     done
 
     chown root:root ${D}/ -R
Signature · 1 line
2.35.1
#42 lore raw

Re: [PATCH] rust: conditionally copy tools like rustfmt

Quoted 30 lines · Randy MacLeod

For qemuppc/mips, rustfmt isn't being built so check that it and related tools exist before copying them. qemuppc/mips are not well-supported in the Rust world but will work to get the build to fixed later.

---
 meta/recipes-devtools/rust/rust_1.63.0.bb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
meta/recipes-devtools/rust/rust_1.63.0.bb +4 -2
index 3081cd5ef3..050f398794 100644
@@ -43,8 +43,10 @@ rust_do_install:class-nativesdk() {
 
     install -d ${D}${bindir}
     for i in cargo-clippy clippy-driver rustfmt; do
-        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
-        chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        if [ -e build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ]; then
+            cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
+            chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        fi
     done
 
     chown root:root ${D}/ -R
@@ -60,8 +62,10 @@ rust_do_install:class-target() {
 
     install -d ${D}${bindir}

meta/recipes-devtools/rust/rust_1.63.0.bb rust_do_install:class-target() { · line 71

Quoted 10 lines
meta/recipes-devtools/rust/rust_1.63.0.bb +4 -2
     for i in cargo-clippy clippy-driver rustfmt; do
-        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
-        chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        if [ -e build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ]; then
+            cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
+            chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        fi
     done
 
     chown root:root ${D}/ -R

I did look into this a bit. The compile logs for ppc are full of horrible warnings and I have patches to clean that up. Once that is done, it comes down to crossbeam-utils trying to use AtomicI64 which doesn't exist on mips or powerpc 32 bit.

https://github.com/tikv/rust-prometheus/issues/315

has some interesting info.

error[E0412]: cannot find type AtomicU64 in module core::sync::atomic
--> /usr/src/debug/rust/1.63.0-r0/rustc-1.63.0-src/vendor/crossbeam-utils/src/atomic/consume.rs:78:14

   |
78 |   impl_atomic!(AtomicU64, u64);
   |                ^^^^^^^^^ help: a struct with a similar name exists: `AtomicU16`

error[E0412]: cannot find type AtomicI64 in module core::sync::atomic

Digging further crossbeam-utils has a no_atomics.rs file listing all the triplets that can't use atomic or have limited 64 bit ones.

Sadly those triplets don't match the ones were using as we have TARGET_VENDOR in ours, for reasons. That will be why it breaks.

I'm trying a patch which changes TARGET_VENDOR -> "-unknown" but I've never written rust code and it takes an age to cycle through so we'll see...

Cheers,

Richard

#43 lore raw

Re: [PATCH] rust: conditionally copy tools like rustfmt

Quoted 5 lines · Richard Purdie

Digging further crossbeam-utils has a no_atomics.rs file listing all the triplets that can't use atomic or have limited 64 bit ones.

Sadly those triplets don't match the ones were using as we have TARGET_VENDOR in ours, for reasons. That will be why it breaks.

Not sure if this helps, but librsvg deals with it thusly:

RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64" RUSTFLAGS:append:mipsel = " --cfg crossbeam_no_atomic_64" RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64"

(it's perhaps worth investigating how this flag is used there)

Alex

#44 lore raw

PATCH 40/42 python3-hatchling: update 1.6.0 -> 1.8.0

In reply to Alexander Kanavin
---
 .../{python3-hatchling_1.6.0.bb => python3-hatchling_1.8.0.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-hatchling_1.6.0.bb => python3-hatchling_1.8.0.bb} (85%)
meta/recipes-devtools/python/python3-hatchling_1.8.0.bb renamed from meta/recipes-devtools/python/python3-hatchling_1.6.0.bb +1 -1
similarity index 85%
rename from meta/recipes-devtools/python/python3-hatchling_1.6.0.bb
rename to meta/recipes-devtools/python/python3-hatchling_1.8.0.bb
index e06bdf02ec..17a10eeb2d 100644
@@ -8,7 +8,7 @@ inherit pypi python_hatchling
 DEPENDS += "python3-pluggy-native python3-tomli-native python3-pathspec-native python3-packaging-native python3-editables-native"
 DEPENDS:remove:class-native = "python3-hatchling-native"
 
-SRC_URI[sha256sum] = "bd6e8505de511ac4217ff50927f6d1845494608e401e63a62b830c31fb613544"
+SRC_URI[sha256sum] = "a4f982fdca0717d8c46bfe7b501302f90aaf2a5302845d550b49c8739681feb2"
 
 do_compile:prepend() {
     export PYTHONPATH=src
Signature · 1 line
2.30.2
#45 lore raw

PATCH 41/42 python3-setuptools: update 63.4.1 -> 65.0.2

In reply to Alexander Kanavin
---
 .../0001-conditionally-do-not-fetch-code-by-easy_install.patch  | 2 +-
 ...ython3-setuptools_63.4.1.bb => python3-setuptools_65.0.2.bb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-setuptools_63.4.1.bb => python3-setuptools_65.0.2.bb} (95%)
meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch +1 -1
index 2888e3d62c..c8c713c842 100644
@@ -1,4 +1,4 @@
-From a020fd90a7060f7783ef286bcdf9dbf307184978 Mon Sep 17 00:00:00 2001
+From 42d349031cd952c12620fcf02cbab70a371f4b19 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Tue, 17 Jul 2018 10:13:38 +0800
 Subject: [PATCH] conditionally do not fetch code by easy_install
meta/recipes-devtools/python/python3-setuptools_65.0.2.bb renamed from meta/recipes-devtools/python/python3-setuptools_63.4.1.bb +1 -1
similarity index 95%
rename from meta/recipes-devtools/python/python3-setuptools_63.4.1.bb
rename to meta/recipes-devtools/python/python3-setuptools_65.0.2.bb
index e31665f3be..1a639ea333 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://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch"
 
-SRC_URI[sha256sum] = "7c7854ee1429a240090297628dc9f75b35318d193537968e2dc14010ee2f5bca"
+SRC_URI[sha256sum] = "101bf15ca723beef42c8db91a761f3748d4d697e17fae904db60c0b619d8d094"
 
 DEPENDS += "${PYTHON_PN}"
 
Signature · 1 line
2.30.2
#46 lore raw

PATCH 42/42 devtool: do not leave behind source trees in workspace/sources

In reply to Alexander Kanavin

These are typically auto-extracted with modify/upgrade from recipes and can be easily recreated. On the rare occasions where they need to be reused, they are still available under workspace/attic (which is already used for old recipes and appends), so nothing gets lost.

This avoids the annoyance of devtool refusing to proceed because there is a previous source tree in workspace/sources.

For independent source trees behave as before: do nothing.

Adjust the test that previously deleted those trees by hand.

---
 meta/lib/oeqa/selftest/cases/devtool.py |  2 --
 scripts/lib/devtool/standard.py         | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)
meta/lib/oeqa/selftest/cases/devtool.py +0 -2
index ec08ac6d60..142932e12f 100644
@@ -1957,7 +1957,6 @@ class DevtoolUpgradeTests(DevtoolBase):
         self._test_recipe_contents(newrecipefile, checkvars, [])
         # Try again - change just name this time
         result = runCmd('devtool reset -n %s' % newrecipename)
-        shutil.rmtree(newsrctree)
         add_recipe()
         newrecipefile = os.path.join(self.workspacedir, 'recipes', newrecipename, '%s_%s.bb' % (newrecipename, recipever))
         result = runCmd('devtool rename %s %s' % (recipename, newrecipename))
@@ -1970,7 +1969,6 @@ class DevtoolUpgradeTests(DevtoolBase):
         self._test_recipe_contents(newrecipefile, checkvars, [])
         # Try again - change just version this time
         result = runCmd('devtool reset -n %s' % newrecipename)
-        shutil.rmtree(newsrctree)
         add_recipe()
         newrecipefile = os.path.join(self.workspacedir, 'recipes', recipename, '%s_%s.bb' % (recipename, newrecipever))
         result = runCmd('devtool rename %s -V %s' % (recipename, newrecipever))
scripts/lib/devtool/standard.py +13 -3
index c98bfe8195..e3b74ab8f0 100644
@@ -1975,9 +1975,19 @@ def _reset(recipes, no_clean, remove_work, config, basepath, workspace):
                         shutil.rmtree(srctreebase)
                     else:
                         # We don't want to risk wiping out any work in progress
-                        logger.info('Leaving source tree %s as-is; if you no '
-                                    'longer need it then please delete it manually'
-                                    % srctreebase)
+                        if srctreebase.startswith(os.path.join(config.workspace_path, 'sources')):
+                            from datetime import datetime
+                            preservesrc = os.path.join(config.workspace_path, 'attic', 'sources', "{}.{}".format(pn,datetime.now().strftime("%Y%m%d%H%M%S")))
+                            logger.info('Preserving source tree in %s\nIf you no '
+                                        'longer need it then please delete it manually.\n'
+                                        'It is also possible to reuse it via devtool source tree argument.'
+                                        % preservesrc)
+                            bb.utils.mkdirhier(os.path.dirname(preservesrc))
+                            shutil.move(srctreebase, preservesrc)
+                        else:
+                            logger.info('Leaving source tree %s as-is; if you no '
+                                        'longer need it then please delete it manually'
+                                        % srctreebase)
             else:
                 # This is unlikely, but if it's empty we can just remove it
                 os.rmdir(srctreebase)
Signature · 1 line
2.30.2