[PATCH 01/21] devtool: correctly handle non-standard source tree locations in upgrades

[PATCH 01/21] devtool: correctly handle non-standard source tree locations in upgrades

[Alexander Kanavin]

When S is set to a sub-directory of upstream source, the license
checks and the bbappend writing (specifically, setting EXTERNALSRC)
need to operate on that sub-directory.

'devtool modify' already has similar logic, and it was copied from there
and adjusted.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 scripts/lib/devtool/upgrade.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index c6d98299da..da1456a01a 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -521,6 +521,15 @@ def upgrade(args, config, basepath, workspace):
         else:
             srctree = standard.get_default_srctree(config, pn)
 
+        # Check that recipe isn't using a shared workdir
+        s = os.path.abspath(rd.getVar('S'))
+        workdir = os.path.abspath(rd.getVar('WORKDIR'))
+        srctree_s = srctree
+        if s.startswith(workdir) and s != workdir and os.path.dirname(s) != workdir:
+            # Handle if S is set to a subdirectory of the source
+            srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1]
+            srctree_s = os.path.join(srctree, srcsubdir)
+
         # try to automatically discover latest version and revision if not provided on command line
         if not args.version and not args.srcrev:
             version_info = oe.recipeutils.get_recipe_upstream_version(rd)
@@ -550,12 +559,12 @@ def upgrade(args, config, basepath, workspace):
         try:
             logger.info('Extracting current version source...')
             rev1, srcsubdir1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides)
-            old_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or ""))
+            old_licenses = _extract_licenses(srctree_s, (rd.getVar('LIC_FILES_CHKSUM') or ""))
             logger.info('Extracting upgraded version source...')
             rev2, md5, sha256, srcbranch, srcsubdir2 = _extract_new_source(args.version, srctree, args.no_patch,
                                                     args.srcrev, args.srcbranch, args.branch, args.keep_temp,
                                                     tinfoil, rd)
-            new_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or ""))
+            new_licenses = _extract_licenses(srctree_s, (rd.getVar('LIC_FILES_CHKSUM') or ""))
             license_diff = _generate_license_diff(old_licenses, new_licenses)
             rf, copied = _create_new_recipe(args.version, md5, sha256, args.srcrev, srcbranch, srcsubdir1, srcsubdir2, config.workspace_path, tinfoil, rd, license_diff, new_licenses, srctree, args.keep_failure)
         except bb.process.CmdError as e:
@@ -564,7 +573,7 @@ def upgrade(args, config, basepath, workspace):
             _upgrade_error(e, rf, srctree, args.keep_failure)
         standard._add_md5(config, pn, os.path.dirname(rf))
 
-        af = _write_append(rf, srctree, args.same_dir, args.no_same_dir, rev2,
+        af = _write_append(rf, srctree_s, args.same_dir, args.no_same_dir, rev2,
                         copied, config.workspace_path, rd)
         standard._add_md5(config, pn, af)
 
-- 
2.31.1

[PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items

[Alexander Kanavin]

oe-core has not been providing multiple versions for any of these items
for a long time, it's not likely to change anytime soon, and it makes
automated (or semi-automated) versions updates with devtool impossible,
as PREFERRED_VERSION masks the updated recipe in devtool workspace.

Specifically, this was prompted by investigating why automated llvm update
doesn't work; it does now.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/conf/distro/include/tcmode-default.inc | 57 ---------------------
 1 file changed, 57 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 68e5d848ba..0571304fdc 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -16,68 +16,11 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
 # Default libc config
 PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 
-GCCVERSION ?= "11.%"
-SDKGCCVERSION ?= "${GCCVERSION}"
-BINUVERSION ?= "2.36%"
-GDBVERSION ?= "10.%"
-GLIBCVERSION ?= "2.33"
-LINUXLIBCVERSION ?= "5.13%"
-QEMUVERSION ?= "6.0%"
-GOVERSION ?= "1.16%"
 # 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 ?= "12.0.0"
 
-PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}"
-PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}"
-PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
-PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}"
-PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
-PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}"
-PREFERRED_VERSION_libgfortran ?= "${GCCVERSION}"
-PREFERRED_VERSION_nativesdk-gcc ?= "${SDKGCCVERSION}"
-PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
-PREFERRED_VERSION_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}"
-PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-native ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-crosssdk-${SDK_SYS} ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}"
-PREFERRED_VERSION_gdb ?= "${GDBVERSION}"
-PREFERRED_VERSION_gdb-cross-${TARGET_ARCH} ?= "${GDBVERSION}"
-PREFERRED_VERSION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GDBVERSION}"
-
-PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
-PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}"
-PREFERRED_VERSION_glibc                    ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-locale             ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-mtrace             ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-scripts            ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_nativesdk-glibc          ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_cross-localedef-native   ?= "${GLIBCVERSION}"
-
-PREFERRED_VERSION_qemu ?= "${QEMUVERSION}"
-PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}"
-PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}"
-
 # Bootstrap Go using a binary release from golang.org.  If you want to bootstrap
 # from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use
 # go-native.
 PREFERRED_PROVIDER_go-native ?= "go-binary-native"
-PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}"
-PREFERRED_VERSION_go-cross-${TUNE_PKGARCH} ?= "${GOVERSION}"
-PREFERRED_VERSION_go-crosssdk-${SDK_ARCH} ?= "${GOVERSION}"
-PREFERRED_VERSION_go-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GOVERSION}"
-PREFERRED_VERSION_go ?= "${GOVERSION}"
-PREFERRED_VERSION_go-native ?= "${GOVERSION}"
-PREFERRED_VERSION_go-runtime ?= "${GOVERSION}"
-PREFERRED_VERSION_nativesdk-go ?= "${GOVERSION}"
-PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}"
-
-PREFERRED_VERSION_llvm = "${LLVMVERSION}"
-PREFERRED_VERSION_llvm-native = "${LLVMVERSION}"
-PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}"
-- 
2.31.1

Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items

[Richard Purdie]

On Wed, 2021-07-14 at 14:25 +0200, Alexander Kanavin wrote:
> oe-core has not been providing multiple versions for any of these items
> for a long time, it's not likely to change anytime soon, and it makes
> automated (or semi-automated) versions updates with devtool impossible,
> as PREFERRED_VERSION masks the updated recipe in devtool workspace.
> 
> Specifically, this was prompted by investigating why automated llvm update
> doesn't work; it does now.
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/conf/distro/include/tcmode-default.inc | 57 ---------------------
>  1 file changed, 57 deletions(-)
> 
> diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> index 68e5d848ba..0571304fdc 100644
> --- a/meta/conf/distro/include/tcmode-default.inc
> +++ b/meta/conf/distro/include/tcmode-default.inc
> @@ -16,68 +16,11 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
>  # Default libc config
>  PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
>  
> 
> 
> 
> 
> 
> 
> 
> -GCCVERSION ?= "11.%"
> -SDKGCCVERSION ?= "${GCCVERSION}"
> -BINUVERSION ?= "2.36%"
> -GDBVERSION ?= "10.%"
> -GLIBCVERSION ?= "2.33"
> -LINUXLIBCVERSION ?= "5.13%"
> -QEMUVERSION ?= "6.0%"
> -GOVERSION ?= "1.16%"
>  # 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 ?= "12.0.0"
>  
> 
> 
> 
> 
> 
> 
> 
> -PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
> -PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
> -PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
> -PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
> -PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}"
> -PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
> -PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}"
> -PREFERRED_VERSION_libgfortran ?= "${GCCVERSION}"
> -PREFERRED_VERSION_nativesdk-gcc ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
> -PREFERRED_VERSION_binutils-native ?= "${BINUVERSION}"
> -PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}"
> -PREFERRED_VERSION_binutils-crosssdk-${SDK_SYS} ?= "${BINUVERSION}"
> -PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}"
> -PREFERRED_VERSION_gdb ?= "${GDBVERSION}"
> -PREFERRED_VERSION_gdb-cross-${TARGET_ARCH} ?= "${GDBVERSION}"
> -PREFERRED_VERSION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GDBVERSION}"
> -
> -PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
> -PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}"
> -PREFERRED_VERSION_glibc                    ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_glibc-locale             ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_glibc-mtrace             ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_glibc-scripts            ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_nativesdk-glibc          ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_cross-localedef-native   ?= "${GLIBCVERSION}"
> -
> -PREFERRED_VERSION_qemu ?= "${QEMUVERSION}"
> -PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}"
> -PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}"
> -
>  # Bootstrap Go using a binary release from golang.org.  If you want to bootstrap
>  # from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use
>  # go-native.
>  PREFERRED_PROVIDER_go-native ?= "go-binary-native"
> -PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-cross-${TUNE_PKGARCH} ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-crosssdk-${SDK_ARCH} ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GOVERSION}"
> -PREFERRED_VERSION_go ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-native ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-runtime ?= "${GOVERSION}"
> -PREFERRED_VERSION_nativesdk-go ?= "${GOVERSION}"
> -PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}"
> -
> -PREFERRED_VERSION_llvm = "${LLVMVERSION}"
> -PREFERRED_VERSION_llvm-native = "${LLVMVERSION}"
> -PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}"
> -

At the very least the GCC variable is well used in other layers as it is hard to 
remember all the different bits of gcc that are listed here so I think that 
should stay. Some of these can probably be removed but I'm not sure how far
we could/should go. glibc's list of recipes isn't trivial either...

Cheers,

Richard

Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items

[Alexander Kanavin]

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

On Wed, 14 Jul 2021 at 14:55, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> At the very least the GCC variable is well used in other layers as it is
> hard to
> remember all the different bits of gcc that are listed here so I think
> that
> should stay. Some of these can probably be removed but I'm not sure how far
> we could/should go. glibc's list of recipes isn't trivial either...
>

I used layerindex to check. Alternative gcc versions are provided by
multiple layers (mostly arm-related), but an alternative older glibc is
only in meta-debian and that is using neither PREFERRED_VERSION directly
nor the *LIBCVERSION convenience (so not sure how it's meant to be used). I
will send a v2 with gcc added back.

Anyone else should probably just copy the PREFERRED_VERSION lines for what
they want to adjust into the layers directly. But let's see what Khem says
- I do think getting help from AUH/devtool in doing the updates fully, or
at least using 'devtool upgrade' locally to prepare the git trees for
manual patch rebasing is valuable.

Alex

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

Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items

[Denys Dmytriyenko]

On Wed, Jul 14, 2021 at 03:40:03PM +0200, Alexander Kanavin wrote:
> On Wed, 14 Jul 2021 at 14:55, Richard Purdie <
> richard.purdie@linuxfoundation.org> wrote:
> 
> > At the very least the GCC variable is well used in other layers as it is
> > hard to
> > remember all the different bits of gcc that are listed here so I think
> > that
> > should stay. Some of these can probably be removed but I'm not sure how far
> > we could/should go. glibc's list of recipes isn't trivial either...
> >
> 
> I used layerindex to check. Alternative gcc versions are provided by
> multiple layers (mostly arm-related), but an alternative older glibc is
> only in meta-debian and that is using neither PREFERRED_VERSION directly
> nor the *LIBCVERSION convenience (so not sure how it's meant to be used). I
> will send a v2 with gcc added back.

Reusing those variables is common in layers dealing with multiple toolchains, 
such as external binary toolchains and such. Might be good to keep them in 
OE-Core for consistency:

GCCVERSION ?= "9.%"
SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.34%"
GDBVERSION ?= "9.%"
GLIBCVERSION ?= "2.31%"
LINUXLIBCVERSION ?= "5.4%"


> Anyone else should probably just copy the PREFERRED_VERSION lines for what
> they want to adjust into the layers directly. But let's see what Khem says
> - I do think getting help from AUH/devtool in doing the updates fully, or
> at least using 'devtool upgrade' locally to prepare the git trees for
> manual patch rebasing is valuable.
> 
> Alex

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items

[Bruce Ashfield]

On Wed, Jul 14, 2021 at 8:26 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> oe-core has not been providing multiple versions for any of these items
> for a long time, it's not likely to change anytime soon, and it makes
> automated (or semi-automated) versions updates with devtool impossible,
> as PREFERRED_VERSION masks the updated recipe in devtool workspace.
>
> Specifically, this was prompted by investigating why automated llvm update
> doesn't work; it does now.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/conf/distro/include/tcmode-default.inc | 57 ---------------------
>  1 file changed, 57 deletions(-)
>
> diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> index 68e5d848ba..0571304fdc 100644
> --- a/meta/conf/distro/include/tcmode-default.inc
> +++ b/meta/conf/distro/include/tcmode-default.inc
> @@ -16,68 +16,11 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
>  # Default libc config
>  PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
>
> -GCCVERSION ?= "11.%"
> -SDKGCCVERSION ?= "${GCCVERSION}"
> -BINUVERSION ?= "2.36%"
> -GDBVERSION ?= "10.%"
> -GLIBCVERSION ?= "2.33"
> -LINUXLIBCVERSION ?= "5.13%"

I'd prefer that libcheaders stays explicitly set.

Bumping libc-headers is something we do carefully, and should not be a
common devtool
operation, and is not something that we want automated at all. Having
that extra variable
to set is a good thing for the headers, it helps reenforce that you
really should know what
you are doing.

Bruce


> -QEMUVERSION ?= "6.0%"
> -GOVERSION ?= "1.16%"
>  # 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 ?= "12.0.0"
>
> -PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
> -PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
> -PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
> -PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
> -PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}"
> -PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
> -PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}"
> -PREFERRED_VERSION_libgfortran ?= "${GCCVERSION}"
> -PREFERRED_VERSION_nativesdk-gcc ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}"
> -PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
> -PREFERRED_VERSION_binutils-native ?= "${BINUVERSION}"
> -PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}"
> -PREFERRED_VERSION_binutils-crosssdk-${SDK_SYS} ?= "${BINUVERSION}"
> -PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}"
> -PREFERRED_VERSION_gdb ?= "${GDBVERSION}"
> -PREFERRED_VERSION_gdb-cross-${TARGET_ARCH} ?= "${GDBVERSION}"
> -PREFERRED_VERSION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GDBVERSION}"
> -
> -PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
> -PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}"
> -PREFERRED_VERSION_glibc                    ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_glibc-locale             ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_glibc-mtrace             ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_glibc-scripts            ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_nativesdk-glibc          ?= "${GLIBCVERSION}"
> -PREFERRED_VERSION_cross-localedef-native   ?= "${GLIBCVERSION}"
> -
> -PREFERRED_VERSION_qemu ?= "${QEMUVERSION}"
> -PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}"
> -PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}"
> -
>  # Bootstrap Go using a binary release from golang.org.  If you want to bootstrap
>  # from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use
>  # go-native.
>  PREFERRED_PROVIDER_go-native ?= "go-binary-native"
> -PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-cross-${TUNE_PKGARCH} ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-crosssdk-${SDK_ARCH} ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GOVERSION}"
> -PREFERRED_VERSION_go ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-native ?= "${GOVERSION}"
> -PREFERRED_VERSION_go-runtime ?= "${GOVERSION}"
> -PREFERRED_VERSION_nativesdk-go ?= "${GOVERSION}"
> -PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}"
> -
> -PREFERRED_VERSION_llvm = "${LLVMVERSION}"
> -PREFERRED_VERSION_llvm-native = "${LLVMVERSION}"
> -PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}"
> --
> 2.31.1
>
>
> 
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items

[Alexander Kanavin]

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

On Wed, 14 Jul 2021 at 16:02, Bruce Ashfield <bruce.ashfield@gmail.com>
wrote:

>
> I'd prefer that libcheaders stays explicitly set.
>
> Bumping libc-headers is something we do carefully, and should not be a
> common devtool
> operation, and is not something that we want automated at all. Having
> that extra variable
> to set is a good thing for the headers, it helps reenforce that you
> really should know what
> you are doing.
>

Right, I'll respin the patch once more.

Alex

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

Re: [OE-core] [PATCH 02/21] tcmode-default.inc: do not set PREFERRED_VERSION for toolchain items

[Khem Raj]

On 7/14/21 7:04 AM, Alexander Kanavin wrote:
> On Wed, 14 Jul 2021 at 16:02, Bruce Ashfield <bruce.ashfield@gmail.com 
> <mailto:bruce.ashfield@gmail.com>> wrote:
> 
> 
>     I'd prefer that libcheaders stays explicitly set.
> 
>     Bumping libc-headers is something we do carefully, and should not be a
>     common devtool
>     operation, and is not something that we want automated at all. Having
>     that extra variable
>     to set is a good thing for the headers, it helps reenforce that you
>     really should know what
>     you are doing.
> 
> 
> Right, I'll respin the patch once more.

if this is not fixing anything besides cleanup then, its not worth doing 
it, there are layers which may not be public which use these variables 
to choose toolchain from external layers which may not be in layer index

> 
> Alex
> 
> 
> 
> 

[PATCH 03/21] llvm: make upgradable via devtool

[Alexander Kanavin]

Assembling PV from bits is too clever for devtool; but it can be
done in the opposite direction.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/llvm/llvm_git.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index 8a5d3dc9bf..de79adc410 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,11 +19,9 @@ inherit cmake pkgconfig
 
 PROVIDES += "llvm${PV}"
 
-MAJOR_VERSION = "12"
-MINOR_VERSION = "0"
-PATCH_VERSION = "0"
+PV = "12.0.0"
 
-PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
+MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}"
 
 LLVM_RELEASE = "${PV}"
 LLVM_DIR = "llvm${LLVM_RELEASE}"
@@ -178,7 +176,7 @@ FILES_${PN}-llvmhello = "\
 FILES_${PN}-dev += " \
     ${libdir}/${LLVM_DIR}/llvm-config \
     ${libdir}/${LLVM_DIR}/libRemarks.so \
-    ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \
+    ${libdir}/${LLVM_DIR}/libLLVM-${PV}.so \
 "
 
 FILES_${PN}-staticdev += "\
-- 
2.31.1

Re: [OE-core] [PATCH 03/21] llvm: make upgradable via devtool

[Khem Raj]

On 7/14/21 5:25 AM, Alexander Kanavin wrote:
> Assembling PV from bits is too clever for devtool; but it can be
> done in the opposite direction.
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>   meta/recipes-devtools/llvm/llvm_git.bb | 8 +++-----
>   1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
> index 8a5d3dc9bf..de79adc410 100644
> --- a/meta/recipes-devtools/llvm/llvm_git.bb
> +++ b/meta/recipes-devtools/llvm/llvm_git.bb
> @@ -19,11 +19,9 @@ inherit cmake pkgconfig
>   
>   PROVIDES += "llvm${PV}"
>   
> -MAJOR_VERSION = "12"
> -MINOR_VERSION = "0"
> -PATCH_VERSION = "0"
> +PV = "12.0.0"

may be rename the recipe to have PV instead of _git as well, while here
>   
> -PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
> +MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}"
>   
>   LLVM_RELEASE = "${PV}"
>   LLVM_DIR = "llvm${LLVM_RELEASE}"
> @@ -178,7 +176,7 @@ FILES_${PN}-llvmhello = "\
>   FILES_${PN}-dev += " \
>       ${libdir}/${LLVM_DIR}/llvm-config \
>       ${libdir}/${LLVM_DIR}/libRemarks.so \
> -    ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \
> +    ${libdir}/${LLVM_DIR}/libLLVM-${PV}.so \
>   "
>   
>   FILES_${PN}-staticdev += "\
> 
> 
> 
> 
> 

[PATCH 04/21] llvm: update 12.0.0 -> 12.0.1

[Alexander Kanavin]

Other than the tcmode tweak, this was done by devtool \0/

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/conf/distro/include/tcmode-default.inc | 2 +-
 meta/recipes-devtools/llvm/llvm_git.bb      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 0571304fdc..19073542ae 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 
 # 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 ?= "12.0.0"
+LLVMVERSION ?= "12.0.1"
 
 # Bootstrap Go using a binary release from golang.org.  If you want to bootstrap
 # from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index de79adc410..4554b752eb 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,7 +19,7 @@ inherit cmake pkgconfig
 
 PROVIDES += "llvm${PV}"
 
-PV = "12.0.0"
+PV = "12.0.1"
 
 MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}"
 
@@ -27,7 +27,7 @@ LLVM_RELEASE = "${PV}"
 LLVM_DIR = "llvm${LLVM_RELEASE}"
 
 BRANCH = "release/${MAJOR_VERSION}.x"
-SRCREV = "fa0971b87fb2c9d14d1bba2551e61f02f18f329b"
+SRCREV = "fed41342a82f5a3a9201819a82bf7a48313e296b"
 SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
            file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \
            file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
-- 
2.31.1

[PATCH 05/21] systemd: update 248.3 -> 249

[Alexander Kanavin]

jinja is now required:
https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...temd-boot_248.3.bb => systemd-boot_249.bb} |  2 +-
 meta/recipes-core/systemd/systemd.inc         |  4 +-
 ...tall-dependency-links-at-install-tim.patch | 38 +++++++++----------
 .../{systemd_248.3.bb => systemd_249.bb}      |  6 +--
 4 files changed, 25 insertions(+), 25 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_248.3.bb => systemd-boot_249.bb} (98%)
 rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.bb} (99%)

diff --git a/meta/recipes-core/systemd/systemd-boot_248.3.bb b/meta/recipes-core/systemd/systemd-boot_249.bb
similarity index 98%
rename from meta/recipes-core/systemd/systemd-boot_248.3.bb
rename to meta/recipes-core/systemd/systemd-boot_249.bb
index 249e620f4e..2c0bec4eda 100644
--- a/meta/recipes-core/systemd/systemd-boot_248.3.bb
+++ b/meta/recipes-core/systemd/systemd-boot_249.bb
@@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
 
 require conf/image-uefi.conf
 
-DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
+DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2-native"
 
 inherit meson pkgconfig gettext
 inherit deploy
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 0524a25008..79fb15f8fe 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76"
-SRCBRANCH = "v248-stable"
+SRCREV = "f6278558da0304ec6b646bb172ce4688c7f162a5"
+SRCBRANCH = "v249-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \
 "
 
diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
index 8dd22eeb7b..d3af734e06 100644
--- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
@@ -1,4 +1,4 @@
-From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001
+From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Thu, 21 Feb 2019 16:23:24 +0800
 Subject: [PATCH] binfmt: Don't install dependency links at install time for
@@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
  units/systemd-binfmt.service.in         | 4 ++++
  3 files changed, 9 insertions(+), 4 deletions(-)
 
-Index: systemd-stable/units/meson.build
-===================================================================
---- systemd-stable.orig/units/meson.build
-+++ systemd-stable/units/meson.build
-@@ -55,8 +55,7 @@ units = [
+diff --git a/units/meson.build b/units/meson.build
+index 17e9ead9c1..e5502be620 100644
+--- a/units/meson.build
++++ b/units/meson.build
+@@ -59,8 +59,7 @@ units = [
          ['poweroff.target',                     '',
           (with_runlevels ? 'runlevel0.target' : '')],
          ['printer.target',                      ''],
@@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build
          ['proc-sys-fs-binfmt_misc.mount',       'ENABLE_BINFMT'],
          ['reboot.target',                       '',
           'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')],
-@@ -166,8 +165,7 @@ in_units = [
-         ['rc-local.service',                     'HAVE_SYSV_COMPAT'],
+@@ -178,8 +177,7 @@ in_units = [
          ['rescue.service',                       ''],
+         ['serial-getty@.service',                ''],
          ['systemd-backlight@.service',           'ENABLE_BACKLIGHT'],
 -        ['systemd-binfmt.service',               'ENABLE_BINFMT',
 -         'sysinit.target.wants/'],
@@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build
          ['systemd-bless-boot.service',           'ENABLE_EFI HAVE_BLKID'],
          ['systemd-boot-check-no-failures.service', ''],
          ['systemd-coredump@.service',            'ENABLE_COREDUMP'],
-Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
-===================================================================
---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount
-+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount
-@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
+diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
+index 172c8757ab..f65d8930c6 100644
+--- a/units/proc-sys-fs-binfmt_misc.automount
++++ b/units/proc-sys-fs-binfmt_misc.automount
+@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/
  
  [Automount]
  Where=/proc/sys/fs/binfmt_misc
 +
 +[Install]
 +WantedBy=sysinit.target
-Index: systemd-stable/units/systemd-binfmt.service.in
-===================================================================
---- systemd-stable.orig/units/systemd-binfmt.service.in
-+++ systemd-stable/units/systemd-binfmt.service.in
+diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
+index fdafce7ff7..4efc05e495 100644
+--- a/units/systemd-binfmt.service.in
++++ b/units/systemd-binfmt.service.in
 @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
  Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
  DefaultDependencies=no
@@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in
  After=proc-sys-fs-binfmt_misc.mount
  Before=sysinit.target shutdown.target
 @@ -30,3 +31,6 @@ RemainAfterExit=yes
- ExecStart=@rootlibexecdir@/systemd-binfmt
- ExecStop=@rootlibexecdir@/systemd-binfmt --unregister
+ ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt
+ ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister
  TimeoutSec=90s
 +
 +[Install]
diff --git a/meta/recipes-core/systemd/systemd_248.3.bb b/meta/recipes-core/systemd/systemd_249.bb
similarity index 99%
rename from meta/recipes-core/systemd/systemd_248.3.bb
rename to meta/recipes-core/systemd/systemd_249.bb
index 37607708f7..9bfb12249c 100644
--- a/meta/recipes-core/systemd/systemd_248.3.bb
+++ b/meta/recipes-core/systemd/systemd_249.bb
@@ -4,7 +4,7 @@ PROVIDES = "udev"
 
 PE = "1"
 
-DEPENDS = "intltool-native gperf-native libcap util-linux"
+DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native"
 
 SECTION = "base/shell"
 
@@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu
 # that we don't build both udev and systemd in world builds.
 REQUIRED_DISTRO_FEATURES = "systemd"
 
-SRC_URI += " \
-           file://touchscreen.rules \
+SRC_URI += "file://touchscreen.rules \
            file://00-create-volatile.conf \
            ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \
            ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \
@@ -686,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \
                ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \
                ${rootlibexecdir}/udev/rules.d/80-drivers.rules \
                ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \
+               ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \
                ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \
                ${rootlibexecdir}/udev/rules.d/README \
                ${sysconfdir}/udev \
-- 
2.31.1

Re: [OE-core] [PATCH 05/21] systemd: update 248.3 -> 249

[Alexandre Belloni]

Hello Alex,

This patch does apply on master but the patch introduced by "systemd:
Fix libseccomp testcase involving __NR_ppoll" needs to be refreshed, can
you do that?

On 14/07/2021 14:25:50+0200, Alexander Kanavin wrote:
> jinja is now required:
> https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  ...temd-boot_248.3.bb => systemd-boot_249.bb} |  2 +-
>  meta/recipes-core/systemd/systemd.inc         |  4 +-
>  ...tall-dependency-links-at-install-tim.patch | 38 +++++++++----------
>  .../{systemd_248.3.bb => systemd_249.bb}      |  6 +--
>  4 files changed, 25 insertions(+), 25 deletions(-)
>  rename meta/recipes-core/systemd/{systemd-boot_248.3.bb => systemd-boot_249.bb} (98%)
>  rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.bb} (99%)
> 
> diff --git a/meta/recipes-core/systemd/systemd-boot_248.3.bb b/meta/recipes-core/systemd/systemd-boot_249.bb
> similarity index 98%
> rename from meta/recipes-core/systemd/systemd-boot_248.3.bb
> rename to meta/recipes-core/systemd/systemd-boot_249.bb
> index 249e620f4e..2c0bec4eda 100644
> --- a/meta/recipes-core/systemd/systemd-boot_248.3.bb
> +++ b/meta/recipes-core/systemd/systemd-boot_249.bb
> @@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
>  
>  require conf/image-uefi.conf
>  
> -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
> +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2-native"
>  
>  inherit meson pkgconfig gettext
>  inherit deploy
> diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
> index 0524a25008..79fb15f8fe 100644
> --- a/meta/recipes-core/systemd/systemd.inc
> +++ b/meta/recipes-core/systemd/systemd.inc
> @@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"
>  LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
>                      file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
>  
> -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76"
> -SRCBRANCH = "v248-stable"
> +SRCREV = "f6278558da0304ec6b646bb172ce4688c7f162a5"
> +SRCBRANCH = "v249-stable"
>  SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \
>  "
>  
> diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> index 8dd22eeb7b..d3af734e06 100644
> --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> @@ -1,4 +1,4 @@
> -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001
> +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001
>  From: Chen Qi <Qi.Chen@windriver.com>
>  Date: Thu, 21 Feb 2019 16:23:24 +0800
>  Subject: [PATCH] binfmt: Don't install dependency links at install time for
> @@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
>   units/systemd-binfmt.service.in         | 4 ++++
>   3 files changed, 9 insertions(+), 4 deletions(-)
>  
> -Index: systemd-stable/units/meson.build
> -===================================================================
> ---- systemd-stable.orig/units/meson.build
> -+++ systemd-stable/units/meson.build
> -@@ -55,8 +55,7 @@ units = [
> +diff --git a/units/meson.build b/units/meson.build
> +index 17e9ead9c1..e5502be620 100644
> +--- a/units/meson.build
> ++++ b/units/meson.build
> +@@ -59,8 +59,7 @@ units = [
>           ['poweroff.target',                     '',
>            (with_runlevels ? 'runlevel0.target' : '')],
>           ['printer.target',                      ''],
> @@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build
>           ['proc-sys-fs-binfmt_misc.mount',       'ENABLE_BINFMT'],
>           ['reboot.target',                       '',
>            'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')],
> -@@ -166,8 +165,7 @@ in_units = [
> -         ['rc-local.service',                     'HAVE_SYSV_COMPAT'],
> +@@ -178,8 +177,7 @@ in_units = [
>           ['rescue.service',                       ''],
> +         ['serial-getty@.service',                ''],
>           ['systemd-backlight@.service',           'ENABLE_BACKLIGHT'],
>  -        ['systemd-binfmt.service',               'ENABLE_BINFMT',
>  -         'sysinit.target.wants/'],
> @@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build
>           ['systemd-bless-boot.service',           'ENABLE_EFI HAVE_BLKID'],
>           ['systemd-boot-check-no-failures.service', ''],
>           ['systemd-coredump@.service',            'ENABLE_COREDUMP'],
> -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
> -===================================================================
> ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount
> -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount
> -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
> +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
> +index 172c8757ab..f65d8930c6 100644
> +--- a/units/proc-sys-fs-binfmt_misc.automount
> ++++ b/units/proc-sys-fs-binfmt_misc.automount
> +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/
>   
>   [Automount]
>   Where=/proc/sys/fs/binfmt_misc
>  +
>  +[Install]
>  +WantedBy=sysinit.target
> -Index: systemd-stable/units/systemd-binfmt.service.in
> -===================================================================
> ---- systemd-stable.orig/units/systemd-binfmt.service.in
> -+++ systemd-stable/units/systemd-binfmt.service.in
> +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
> +index fdafce7ff7..4efc05e495 100644
> +--- a/units/systemd-binfmt.service.in
> ++++ b/units/systemd-binfmt.service.in
>  @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
>   Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
>   DefaultDependencies=no
> @@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in
>   After=proc-sys-fs-binfmt_misc.mount
>   Before=sysinit.target shutdown.target
>  @@ -30,3 +31,6 @@ RemainAfterExit=yes
> - ExecStart=@rootlibexecdir@/systemd-binfmt
> - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister
> + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt
> + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister
>   TimeoutSec=90s
>  +
>  +[Install]
> diff --git a/meta/recipes-core/systemd/systemd_248.3.bb b/meta/recipes-core/systemd/systemd_249.bb
> similarity index 99%
> rename from meta/recipes-core/systemd/systemd_248.3.bb
> rename to meta/recipes-core/systemd/systemd_249.bb
> index 37607708f7..9bfb12249c 100644
> --- a/meta/recipes-core/systemd/systemd_248.3.bb
> +++ b/meta/recipes-core/systemd/systemd_249.bb
> @@ -4,7 +4,7 @@ PROVIDES = "udev"
>  
>  PE = "1"
>  
> -DEPENDS = "intltool-native gperf-native libcap util-linux"
> +DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native"
>  
>  SECTION = "base/shell"
>  
> @@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu
>  # that we don't build both udev and systemd in world builds.
>  REQUIRED_DISTRO_FEATURES = "systemd"
>  
> -SRC_URI += " \
> -           file://touchscreen.rules \
> +SRC_URI += "file://touchscreen.rules \
>             file://00-create-volatile.conf \
>             ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \
>             ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \
> @@ -686,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \
>                 ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \
>                 ${rootlibexecdir}/udev/rules.d/80-drivers.rules \
>                 ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \
> +               ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \
>                 ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \
>                 ${rootlibexecdir}/udev/rules.d/README \
>                 ${sysconfdir}/udev \
> -- 
> 2.31.1
> 

> 
> 
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 05/21] systemd: update 248.3 -> 249

[Khem Raj]

On Sat, Jul 17, 2021 at 3:58 PM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> Hello Alex,
>
> This patch does apply on master but the patch introduced by "systemd:
> Fix libseccomp testcase involving __NR_ppoll" needs to be refreshed, can
> you do that?

this patch is already upstream in 249 so you can drop it when upgrading to 249+

>
> On 14/07/2021 14:25:50+0200, Alexander Kanavin wrote:
> > jinja is now required:
> > https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704
> >
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> >  ...temd-boot_248.3.bb => systemd-boot_249.bb} |  2 +-
> >  meta/recipes-core/systemd/systemd.inc         |  4 +-
> >  ...tall-dependency-links-at-install-tim.patch | 38 +++++++++----------
> >  .../{systemd_248.3.bb => systemd_249.bb}      |  6 +--
> >  4 files changed, 25 insertions(+), 25 deletions(-)
> >  rename meta/recipes-core/systemd/{systemd-boot_248.3.bb => systemd-boot_249.bb} (98%)
> >  rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.bb} (99%)
> >
> > diff --git a/meta/recipes-core/systemd/systemd-boot_248.3.bb b/meta/recipes-core/systemd/systemd-boot_249.bb
> > similarity index 98%
> > rename from meta/recipes-core/systemd/systemd-boot_248.3.bb
> > rename to meta/recipes-core/systemd/systemd-boot_249.bb
> > index 249e620f4e..2c0bec4eda 100644
> > --- a/meta/recipes-core/systemd/systemd-boot_248.3.bb
> > +++ b/meta/recipes-core/systemd/systemd-boot_249.bb
> > @@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
> >
> >  require conf/image-uefi.conf
> >
> > -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
> > +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2-native"
> >
> >  inherit meson pkgconfig gettext
> >  inherit deploy
> > diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
> > index 0524a25008..79fb15f8fe 100644
> > --- a/meta/recipes-core/systemd/systemd.inc
> > +++ b/meta/recipes-core/systemd/systemd.inc
> > @@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"
> >  LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
> >                      file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
> >
> > -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76"
> > -SRCBRANCH = "v248-stable"
> > +SRCREV = "f6278558da0304ec6b646bb172ce4688c7f162a5"
> > +SRCBRANCH = "v249-stable"
> >  SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \
> >  "
> >
> > diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> > index 8dd22eeb7b..d3af734e06 100644
> > --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> > +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> > @@ -1,4 +1,4 @@
> > -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001
> > +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001
> >  From: Chen Qi <Qi.Chen@windriver.com>
> >  Date: Thu, 21 Feb 2019 16:23:24 +0800
> >  Subject: [PATCH] binfmt: Don't install dependency links at install time for
> > @@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
> >   units/systemd-binfmt.service.in         | 4 ++++
> >   3 files changed, 9 insertions(+), 4 deletions(-)
> >
> > -Index: systemd-stable/units/meson.build
> > -===================================================================
> > ---- systemd-stable.orig/units/meson.build
> > -+++ systemd-stable/units/meson.build
> > -@@ -55,8 +55,7 @@ units = [
> > +diff --git a/units/meson.build b/units/meson.build
> > +index 17e9ead9c1..e5502be620 100644
> > +--- a/units/meson.build
> > ++++ b/units/meson.build
> > +@@ -59,8 +59,7 @@ units = [
> >           ['poweroff.target',                     '',
> >            (with_runlevels ? 'runlevel0.target' : '')],
> >           ['printer.target',                      ''],
> > @@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build
> >           ['proc-sys-fs-binfmt_misc.mount',       'ENABLE_BINFMT'],
> >           ['reboot.target',                       '',
> >            'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')],
> > -@@ -166,8 +165,7 @@ in_units = [
> > -         ['rc-local.service',                     'HAVE_SYSV_COMPAT'],
> > +@@ -178,8 +177,7 @@ in_units = [
> >           ['rescue.service',                       ''],
> > +         ['serial-getty@.service',                ''],
> >           ['systemd-backlight@.service',           'ENABLE_BACKLIGHT'],
> >  -        ['systemd-binfmt.service',               'ENABLE_BINFMT',
> >  -         'sysinit.target.wants/'],
> > @@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build
> >           ['systemd-bless-boot.service',           'ENABLE_EFI HAVE_BLKID'],
> >           ['systemd-boot-check-no-failures.service', ''],
> >           ['systemd-coredump@.service',            'ENABLE_COREDUMP'],
> > -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
> > -===================================================================
> > ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount
> > -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount
> > -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
> > +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
> > +index 172c8757ab..f65d8930c6 100644
> > +--- a/units/proc-sys-fs-binfmt_misc.automount
> > ++++ b/units/proc-sys-fs-binfmt_misc.automount
> > +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/
> >
> >   [Automount]
> >   Where=/proc/sys/fs/binfmt_misc
> >  +
> >  +[Install]
> >  +WantedBy=sysinit.target
> > -Index: systemd-stable/units/systemd-binfmt.service.in
> > -===================================================================
> > ---- systemd-stable.orig/units/systemd-binfmt.service.in
> > -+++ systemd-stable/units/systemd-binfmt.service.in
> > +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
> > +index fdafce7ff7..4efc05e495 100644
> > +--- a/units/systemd-binfmt.service.in
> > ++++ b/units/systemd-binfmt.service.in
> >  @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
> >   Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
> >   DefaultDependencies=no
> > @@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in
> >   After=proc-sys-fs-binfmt_misc.mount
> >   Before=sysinit.target shutdown.target
> >  @@ -30,3 +31,6 @@ RemainAfterExit=yes
> > - ExecStart=@rootlibexecdir@/systemd-binfmt
> > - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister
> > + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt
> > + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister
> >   TimeoutSec=90s
> >  +
> >  +[Install]
> > diff --git a/meta/recipes-core/systemd/systemd_248.3.bb b/meta/recipes-core/systemd/systemd_249.bb
> > similarity index 99%
> > rename from meta/recipes-core/systemd/systemd_248.3.bb
> > rename to meta/recipes-core/systemd/systemd_249.bb
> > index 37607708f7..9bfb12249c 100644
> > --- a/meta/recipes-core/systemd/systemd_248.3.bb
> > +++ b/meta/recipes-core/systemd/systemd_249.bb
> > @@ -4,7 +4,7 @@ PROVIDES = "udev"
> >
> >  PE = "1"
> >
> > -DEPENDS = "intltool-native gperf-native libcap util-linux"
> > +DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native"
> >
> >  SECTION = "base/shell"
> >
> > @@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu
> >  # that we don't build both udev and systemd in world builds.
> >  REQUIRED_DISTRO_FEATURES = "systemd"
> >
> > -SRC_URI += " \
> > -           file://touchscreen.rules \
> > +SRC_URI += "file://touchscreen.rules \
> >             file://00-create-volatile.conf \
> >             ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \
> >             ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \
> > @@ -686,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \
> >                 ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \
> >                 ${rootlibexecdir}/udev/rules.d/80-drivers.rules \
> >                 ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \
> > +               ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \
> >                 ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \
> >                 ${rootlibexecdir}/udev/rules.d/README \
> >                 ${sysconfdir}/udev \
> > --
> > 2.31.1
> >
>
> >
> >
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
> 
>

Re: [OE-core] [PATCH 05/21] systemd: update 248.3 -> 249

[Alexander Kanavin]

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

I amended my commit, and will resend with the next upgrade batch.

Alex

On Sun, 18 Jul 2021 at 02:44, Khem Raj <raj.khem@gmail.com> wrote:

> On Sat, Jul 17, 2021 at 3:58 PM Alexandre Belloni
> <alexandre.belloni@bootlin.com> wrote:
> >
> > Hello Alex,
> >
> > This patch does apply on master but the patch introduced by "systemd:
> > Fix libseccomp testcase involving __NR_ppoll" needs to be refreshed, can
> > you do that?
>
> this patch is already upstream in 249 so you can drop it when upgrading to
> 249+
>
> >
> > On 14/07/2021 14:25:50+0200, Alexander Kanavin wrote:
> > > jinja is now required:
> > >
> https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704
> > >
> > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > ---
> > >  ...temd-boot_248.3.bb => systemd-boot_249.bb} |  2 +-
> > >  meta/recipes-core/systemd/systemd.inc         |  4 +-
> > >  ...tall-dependency-links-at-install-tim.patch | 38 +++++++++----------
> > >  .../{systemd_248.3.bb => systemd_249.bb}      |  6 +--
> > >  4 files changed, 25 insertions(+), 25 deletions(-)
> > >  rename meta/recipes-core/systemd/{systemd-boot_248.3.bb =>
> systemd-boot_249.bb} (98%)
> > >  rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.bb}
> (99%)
> > >
> > > diff --git a/meta/recipes-core/systemd/systemd-boot_248.3.bb
> b/meta/recipes-core/systemd/systemd-boot_249.bb
> > > similarity index 98%
> > > rename from meta/recipes-core/systemd/systemd-boot_248.3.bb
> > > rename to meta/recipes-core/systemd/systemd-boot_249.bb
> > > index 249e620f4e..2c0bec4eda 100644
> > > --- a/meta/recipes-core/systemd/systemd-boot_248.3.bb
> > > +++ b/meta/recipes-core/systemd/systemd-boot_249.bb
> > > @@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
> > >
> > >  require conf/image-uefi.conf
> > >
> > > -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
> > > +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native
> python3-jinja2-native"
> > >
> > >  inherit meson pkgconfig gettext
> > >  inherit deploy
> > > diff --git a/meta/recipes-core/systemd/systemd.inc
> b/meta/recipes-core/systemd/systemd.inc
> > > index 0524a25008..79fb15f8fe 100644
> > > --- a/meta/recipes-core/systemd/systemd.inc
> > > +++ b/meta/recipes-core/systemd/systemd.inc
> > > @@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"
> > >  LIC_FILES_CHKSUM =
> "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
> > >
> file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
> > >
> > > -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76"
> > > -SRCBRANCH = "v248-stable"
> > > +SRCREV = "f6278558da0304ec6b646bb172ce4688c7f162a5"
> > > +SRCBRANCH = "v249-stable"
> > >  SRC_URI = "git://
> github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}
> <http://github.com/systemd/systemd-stable.git;protocol=git;branch=$%7BSRCBRANCH%7D>
> \
> > >  "
> > >
> > > diff --git
> a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> > > index 8dd22eeb7b..d3af734e06 100644
> > > ---
> a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> > > +++
> b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> > > @@ -1,4 +1,4 @@
> > > -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001
> > > +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001
> > >  From: Chen Qi <Qi.Chen@windriver.com>
> > >  Date: Thu, 21 Feb 2019 16:23:24 +0800
> > >  Subject: [PATCH] binfmt: Don't install dependency links at install
> time for
> > > @@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <
> scott.murray@konsulko.com>
> > >   units/systemd-binfmt.service.in         | 4 ++++
> > >   3 files changed, 9 insertions(+), 4 deletions(-)
> > >
> > > -Index: systemd-stable/units/meson.build
> > > -===================================================================
> > > ---- systemd-stable.orig/units/meson.build
> > > -+++ systemd-stable/units/meson.build
> > > -@@ -55,8 +55,7 @@ units = [
> > > +diff --git a/units/meson.build b/units/meson.build
> > > +index 17e9ead9c1..e5502be620 100644
> > > +--- a/units/meson.build
> > > ++++ b/units/meson.build
> > > +@@ -59,8 +59,7 @@ units = [
> > >           ['poweroff.target',                     '',
> > >            (with_runlevels ? 'runlevel0.target' : '')],
> > >           ['printer.target',                      ''],
> > > @@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build
> > >           ['proc-sys-fs-binfmt_misc.mount',       'ENABLE_BINFMT'],
> > >           ['reboot.target',                       '',
> > >            'ctrl-alt-del.target' + (with_runlevels ? '
> runlevel6.target' : '')],
> > > -@@ -166,8 +165,7 @@ in_units = [
> > > -         ['rc-local.service',                     'HAVE_SYSV_COMPAT'],
> > > +@@ -178,8 +177,7 @@ in_units = [
> > >           ['rescue.service',                       ''],
> > > +         ['serial-getty@.service',                ''],
> > >           ['systemd-backlight@.service',
>  'ENABLE_BACKLIGHT'],
> > >  -        ['systemd-binfmt.service',               'ENABLE_BINFMT',
> > >  -         'sysinit.target.wants/'],
> > > @@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build
> > >           ['systemd-bless-boot.service',           'ENABLE_EFI
> HAVE_BLKID'],
> > >           ['systemd-boot-check-no-failures.service', ''],
> > >           ['systemd-coredump@.service',            'ENABLE_COREDUMP'],
> > > -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
> > > -===================================================================
> > > ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount
> > > -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount
> > > -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
> > > +diff --git a/units/proc-sys-fs-binfmt_misc.automount
> b/units/proc-sys-fs-binfmt_misc.automount
> > > +index 172c8757ab..f65d8930c6 100644
> > > +--- a/units/proc-sys-fs-binfmt_misc.automount
> > > ++++ b/units/proc-sys-fs-binfmt_misc.automount
> > > +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/
> > >
> > >   [Automount]
> > >   Where=/proc/sys/fs/binfmt_misc
> > >  +
> > >  +[Install]
> > >  +WantedBy=sysinit.target
> > > -Index: systemd-stable/units/systemd-binfmt.service.in
> > > -===================================================================
> > > ---- systemd-stable.orig/units/systemd-binfmt.service.in
> > > -+++ systemd-stable/units/systemd-binfmt.service.in
> > > +diff --git a/units/systemd-binfmt.service.in b/units/
> systemd-binfmt.service.in
> > > +index fdafce7ff7..4efc05e495 100644
> > > +--- a/units/systemd-binfmt.service.in
> > > ++++ b/units/systemd-binfmt.service.in
> > >  @@ -14,6 +14,7 @@ Documentation=
> https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
> > >   Documentation=
> https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
> > >   DefaultDependencies=no
> > > @@ -73,8 +73,8 @@ Index: systemd-stable/units/
> systemd-binfmt.service.in
> > >   After=proc-sys-fs-binfmt_misc.mount
> > >   Before=sysinit.target shutdown.target
> > >  @@ -30,3 +31,6 @@ RemainAfterExit=yes
> > > - ExecStart=@rootlibexecdir@/systemd-binfmt
> > > - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister
> > > + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt
> > > + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister
> > >   TimeoutSec=90s
> > >  +
> > >  +[Install]
> > > diff --git a/meta/recipes-core/systemd/systemd_248.3.bb
> b/meta/recipes-core/systemd/systemd_249.bb
> > > similarity index 99%
> > > rename from meta/recipes-core/systemd/systemd_248.3.bb
> > > rename to meta/recipes-core/systemd/systemd_249.bb
> > > index 37607708f7..9bfb12249c 100644
> > > --- a/meta/recipes-core/systemd/systemd_248.3.bb
> > > +++ b/meta/recipes-core/systemd/systemd_249.bb
> > > @@ -4,7 +4,7 @@ PROVIDES = "udev"
> > >
> > >  PE = "1"
> > >
> > > -DEPENDS = "intltool-native gperf-native libcap util-linux"
> > > +DEPENDS = "intltool-native gperf-native libcap util-linux
> python3-jinja2-native"
> > >
> > >  SECTION = "base/shell"
> > >
> > > @@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative
> update-rc.d update-alternatives qemu
> > >  # that we don't build both udev and systemd in world builds.
> > >  REQUIRED_DISTRO_FEATURES = "systemd"
> > >
> > > -SRC_URI += " \
> > > -           file://touchscreen.rules \
> > > +SRC_URI += "file://touchscreen.rules \
> > >             file://00-create-volatile.conf \
> > >             ${@bb.utils.contains('PACKAGECONFIG',
> 'polkit_hostnamed_fallback',
> 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \
> > >             ${@bb.utils.contains('PACKAGECONFIG',
> 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '',
> d)} \
> > > @@ -686,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \
> > >                 ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \
> > >                 ${rootlibexecdir}/udev/rules.d/80-drivers.rules \
> > >                 ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules
> \
> > > +               ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \
> > >                 ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \
> > >                 ${rootlibexecdir}/udev/rules.d/README \
> > >                 ${sysconfdir}/udev \
> > > --
> > > 2.31.1
> > >
> >
> > >
> > >
> > >
> >
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
> >
> > 
> >
>

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

[PATCH 06/21] xserver-xorg: update 1.20.11 -> 1.20.12

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc             | 2 +-
 .../{xserver-xorg_1.20.11.bb => xserver-xorg_1.20.12.bb}        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.11.bb => xserver-xorg_1.20.12.bb} (93%)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index e2fefd9db8..8b0cc27488 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -15,7 +15,7 @@ PROVIDES += "virtual/xserver"
 PE = "2"
 
 XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.xz"
 
 UPSTREAM_CHECK_REGEX = "xorg-server-(?P<pver>\d+(\.(?!99)\d+)+)\.tar"
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.12.bb
similarity index 93%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.12.bb
index 1eb2056b8a..8f86bea878 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.12.bb
@@ -8,7 +8,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat
            file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
            file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \
            "
-SRC_URI[sha256sum] = "914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49"
+SRC_URI[sha256sum] = "336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac"
 
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.
-- 
2.31.1

[PATCH 07/21] libmodulemd: update 2.12.1 -> 2.13.0

[Alexander Kanavin]

Delete patch, as the issue is fixed upstream.

Disable python bindings as they're not used anywhere,
and require functional gobject introspection.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...e-the-manpage-only-if-the-feature-is.patch | 28 -------------------
 .../libmodulemd/libmodulemd_git.bb            | 16 ++++-------
 2 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch

diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch
deleted file mode 100644
index d5c87a1154..0000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a04fd2c8ac9e0f7a6fc17f02b2a95227b3d0aae4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 31 Mar 2020 16:06:39 +0200
-Subject: [PATCH] modulemd: generate the manpage only if the feature is enabled
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- modulemd/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modulemd/meson.build b/modulemd/meson.build
-index 9ef1902..9f71e72 100644
---- a/modulemd/meson.build
-+++ b/modulemd/meson.build
-@@ -494,6 +494,7 @@ if with_docs
-     )
- endif
- 
-+if with_manpages == 'enabled'
- help2man_opts = [
-   '--no-info',
-   '--section=1',
-@@ -506,3 +507,4 @@ custom_target(
-     ],
-     install: true,
-     install_dir: join_paths(get_option('mandir'), 'man1'))
-+endif
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
index 771b2c094f..963e881d6c 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
@@ -4,25 +4,21 @@ DESCRIPTION = "${SUMMARY}"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
 
-SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main \
-           file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \
-           "
+SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main"
 
-PV = "2.12.1"
-SRCREV = "c0897fa0e9d7d1305fd4813b1010c1d4cca42346"
+PV = "2.13.0"
+SRCREV = "1a032da198333ee77bdbe4be65e60eb4115ea73f"
 
 S = "${WORKDIR}/git"
 
-inherit meson gobject-introspection python3-dir
+inherit meson gobject-introspection
 
-EXTRA_OEMESON = "-Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides"
+EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides"
 
-DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
+DEPENDS += "glib-2.0 libyaml glib-2.0-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
 GIR_MESON_OPTION = 'skip_introspection'
 GIR_MESON_ENABLE_FLAG = 'false'
 GIR_MESON_DISABLE_FLAG = 'true'
-
-FILES_${PN} += "${libdir}/${PYTHON_DIR}/*"
-- 
2.31.1

[PATCH 08/21] bluez5: upgrade 5.59 -> 5.60

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../bluez5/{bluez5_5.59.bb => bluez5_5.60.bb}                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-connectivity/bluez5/{bluez5_5.59.bb => bluez5_5.60.bb} (95%)

diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.59.bb b/meta/recipes-connectivity/bluez5/bluez5_5.60.bb
similarity index 95%
rename from meta/recipes-connectivity/bluez5/bluez5_5.59.bb
rename to meta/recipes-connectivity/bluez5/bluez5_5.60.bb
index 7842eac76d..defa0c15cd 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.59.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.60.bb
@@ -1,6 +1,6 @@
 require bluez5.inc
 
-SRC_URI[sha256sum] = "046b95b386d0bfb2a16311fe799d517ee7735045512d89902c4ed701db477316"
+SRC_URI[sha256sum] = "710999580d01ee59ec585e5e7c07fd94eddedc001aa26fe7464c546f9d945304"
 
 # These issues have kernel fixes rather than bluez fixes so exclude here
 CVE_CHECK_WHITELIST += "CVE-2020-12352 CVE-2020-24490"
-- 
2.31.1

[PATCH 09/21] createrepo-c: upgrade 0.17.3 -> 0.17.4

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../{createrepo-c_0.17.3.bb => createrepo-c_0.17.4.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.17.3.bb => createrepo-c_0.17.4.bb} (96%)

diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.3.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb
similarity index 96%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.17.3.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb
index 481c4bff29..206c27c04f 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.3.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
            file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            "
 
-SRCREV = "8196982f0974c268898a5550d61b374bd58103e2"
+SRCREV = "cb74969736bdea86465e85feeceb895ff7a42610"
 
 S = "${WORKDIR}/git"
 
-- 
2.31.1

[PATCH 10/21] ethtool: upgrade 5.12 -> 5.13

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../ethtool/ethtool/avoid_parallel_tests.patch              | 6 +++---
 .../ethtool/{ethtool_5.12.bb => ethtool_5.13.bb}            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/ethtool/{ethtool_5.12.bb => ethtool_5.13.bb} (93%)

diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index b3f3de4a16..3b639ebb67 100644
--- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
+++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -1,4 +1,4 @@
-From b493e2fb472307997576eef33cce784594070f44 Mon Sep 17 00:00:00 2001
+From e652ccd8965895087887c270fc0d380b61f96b11 Mon Sep 17 00:00:00 2001
 From: Tudor Florea <tudor.florea@enea.com>
 Date: Wed, 28 May 2014 18:59:54 +0200
 Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 13c2bc0..0b6ca1d 100644
+index 6b620bf..ff62b2a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_INIT(ethtool, 5.12, netdev@vger.kernel.org)
+ AC_INIT(ethtool, 5.13, netdev@vger.kernel.org)
  AC_PREREQ(2.52)
  AC_CONFIG_SRCDIR([ethtool.c])
 -AM_INIT_AUTOMAKE([gnu subdir-objects])
diff --git a/meta/recipes-extended/ethtool/ethtool_5.12.bb b/meta/recipes-extended/ethtool/ethtool_5.13.bb
similarity index 93%
rename from meta/recipes-extended/ethtool/ethtool_5.12.bb
rename to meta/recipes-extended/ethtool/ethtool_5.13.bb
index df7dd47748..8f6a7904a2 100644
--- a/meta/recipes-extended/ethtool/ethtool_5.12.bb
+++ b/meta/recipes-extended/ethtool/ethtool_5.13.bb
@@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
            file://avoid_parallel_tests.patch \
            "
 
-SRC_URI[sha256sum] = "7ca623cc1dd25ba66531573da6a11f1ecde9b62b00742d9ba54f9ba983439bfa"
+SRC_URI[sha256sum] = "e66ab0d74d2a888fd64a0053290dbea66ddc9b75b3d21d117b7edd9576b9db60"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
 
-- 
2.31.1

[PATCH 11/21] gtk+3: upgrade 3.24.29 -> 3.24.30

[Alexander Kanavin]

cloudprint support removed upstream:
https://gitlab.gnome.org/GNOME/gtk/-/commit/c77ea5101e55b8690127beed14b26dd3520889b5

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-gnome/gtk+/gtk+3.inc             |  1 -
 ...-Add-disable-opengl-configure-option.patch | 44 +++++++++----------
 .../{gtk+3_3.24.29.bb => gtk+3_3.24.30.bb}    |  2 +-
 3 files changed, 23 insertions(+), 24 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk+3_3.24.29.bb => gtk+3_3.24.30.bb} (89%)

diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 8d5edb7ee8..1445c406d8 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -63,7 +63,6 @@ PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy"
 PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl"
 PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native"
 PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups"
-PACKAGECONFIG[cloudprint] = "--enable-cloudprint,--disable-cloudprint,rest json-glib"
 PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord"
 
 prepare_gtk_scripts() {
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
index 398c9bc36a..35cbab8761 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
@@ -1,4 +1,4 @@
-From f83fcf1991afad6d9c15546b2ccd775dad4e314c Mon Sep 17 00:00:00 2001
+From eef50c94587fc30cd624adb5eb213eb9fa663dc1 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Date: Tue, 21 Jun 2016 15:11:39 +0300
 Subject: [PATCH] Add --disable-opengl configure option
@@ -47,7 +47,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  create mode 100644 gdk/x11/gdkx-without-gl-context.h
 
 diff --git a/configure.ac b/configure.ac
-index bd651bb..b4c061f 100644
+index 851bcbf..6cbf6a2 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -346,6 +346,15 @@ AC_ARG_ENABLE(cloudproviders,
@@ -210,7 +210,7 @@ index 932daf1..54239d6 100644
  
    return info;
 diff --git a/gdk/Makefile.am b/gdk/Makefile.am
-index 479d6a1..7edbee8 100644
+index 710a548..b45f631 100644
 --- a/gdk/Makefile.am
 +++ b/gdk/Makefile.am
 @@ -274,7 +274,6 @@ x11_introspection_files = 		\
@@ -243,10 +243,10 @@ index 479d6a1..7edbee8 100644
  GdkX11_3_0_gir_SCANNERFLAGS = 		\
  	--identifier-prefix=Gdk		\
 diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
-index 240c99f..9eb49bf 100644
+index 748f548..911ab2a 100644
 --- a/gdk/gdkdisplay.c
 +++ b/gdk/gdkdisplay.c
-@@ -2419,7 +2419,9 @@ gboolean
+@@ -2420,7 +2420,9 @@ gboolean
  gdk_display_make_gl_context_current (GdkDisplay   *display,
                                       GdkGLContext *context)
  {
@@ -258,7 +258,7 @@ index 240c99f..9eb49bf 100644
  
  GdkRenderingMode
 diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
-index 933e204..1767508 100644
+index 9690077..55f85ef 100644
 --- a/gdk/gdkgl.c
 +++ b/gdk/gdkgl.c
 @@ -26,7 +26,9 @@
@@ -334,7 +334,7 @@ index 933e204..1767508 100644
 +#endif
  }
 diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
-index dfbed63..556f0a3 100644
+index 3b23639..1f04f8e 100644
 --- a/gdk/gdkglcontext.c
 +++ b/gdk/gdkglcontext.c
 @@ -85,7 +85,9 @@
@@ -380,7 +380,7 @@ index dfbed63..556f0a3 100644
  
  /**
 diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index 6ae0f86..4e48a2a 100644
+index 2de8ba4..1883a79 100644
 --- a/gdk/gdkwindow.c
 +++ b/gdk/gdkwindow.c
 @@ -45,7 +45,9 @@
@@ -513,7 +513,7 @@ index 32b1f24..6352313 100644
 +
  -include $(top_srcdir)/git.mk
 diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
-index 817944e..e7a2947 100644
+index 7e08f47..30fd7b6 100644
 --- a/gdk/x11/gdkdisplay-x11.c
 +++ b/gdk/x11/gdkdisplay-x11.c
 @@ -37,7 +37,9 @@
@@ -526,7 +526,7 @@ index 817944e..e7a2947 100644
  #include "gdk-private.h"
  #include "gdkprofilerprivate.h"
  
-@@ -3188,7 +3190,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
+@@ -3191,7 +3193,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
    display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list;
    display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target;
  
@@ -538,10 +538,10 @@ index 817944e..e7a2947 100644
    display_class->get_default_seat = gdk_x11_display_get_default_seat;
  
 diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
-index 8939ae9..931bff9 100644
+index bb4df05..46f5349 100644
 --- a/gdk/x11/gdkscreen-x11.c
 +++ b/gdk/x11/gdkscreen-x11.c
-@@ -1723,3 +1723,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen)
+@@ -1827,3 +1827,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen)
  {
    return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP");
  }
@@ -551,7 +551,7 @@ index 8939ae9..931bff9 100644
 +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {}
 +#endif
 diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index 1fe7b90..d23a347 100644
+index 721d9bb..8e87acc 100644
 --- a/gdk/x11/gdkwindow-x11.c
 +++ b/gdk/x11/gdkwindow-x11.c
 @@ -36,7 +36,9 @@
@@ -564,7 +564,7 @@ index 1fe7b90..d23a347 100644
  #include "gdkprivate-x11.h"
  #include "gdk-private.h"
  
-@@ -5861,7 +5863,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
+@@ -5881,7 +5883,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
    impl_class->set_opaque_region = gdk_x11_window_set_opaque_region;
    impl_class->set_shadow_width = gdk_x11_window_set_shadow_width;
    impl_class->show_window_menu = gdk_x11_window_show_window_menu;
@@ -668,10 +668,10 @@ index 0000000..c9e2617
 +
 +#endif /* __GDK_X_H__ */
 diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index eaca473..99352d1 100644
+index 074fb35..4fa9eb6 100644
 --- a/gtk/Makefile.am
 +++ b/gtk/Makefile.am
-@@ -1449,7 +1449,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s
+@@ -1457,7 +1457,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s
  	  ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
  	  $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
  	  sort | uniq | \
@@ -681,7 +681,7 @@ index eaca473..99352d1 100644
  $(srcdir)/gtktestutils.c: gtktypefuncs.inc
  
 diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
-index 9a56443..7de0db2 100644
+index 802303e..33001cf 100644
 --- a/gtk/gtkglarea.c
 +++ b/gtk/gtkglarea.c
 @@ -29,7 +29,9 @@
@@ -724,8 +724,8 @@ index 9a56443..7de0db2 100644
  
    g_return_if_fail (GTK_IS_GL_AREA (area));
 @@ -533,11 +540,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area)
-         glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT,
-                                       GL_RENDERBUFFER_EXT, priv->depth_stencil_buffer);
+         glFramebufferRenderbuffer (GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
+                                    GL_RENDERBUFFER, priv->depth_stencil_buffer);
      }
 +#endif
  }
@@ -738,7 +738,7 @@ index 9a56443..7de0db2 100644
  
    if (priv->context == NULL)
 @@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area)
-       glDeleteFramebuffersEXT (1, &priv->frame_buffer);
+       glDeleteFramebuffers (1, &priv->frame_buffer);
        priv->frame_buffer = 0;
      }
 +#endif
@@ -777,7 +777,7 @@ index 9a56443..7de0db2 100644
  
  static gboolean
 diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
-index c241ec8..24576dd 100644
+index 48237d1..1f9b9be 100644
 --- a/gtk/inspector/general.c
 +++ b/gtk/inspector/general.c
 @@ -33,8 +33,10 @@
@@ -824,7 +824,7 @@ index c241ec8..24576dd 100644
    if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
      {
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index ee1e8b5..e6c6502 100644
+index f283e89..5e7180e 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
 @@ -80,8 +80,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.29.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.30.bb
similarity index 89%
rename from meta/recipes-gnome/gtk+/gtk+3_3.24.29.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.24.30.bb
index 031fbb6d66..7e7566f9af 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.24.29.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.30.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
            file://0003-Add-disable-opengl-configure-option.patch \
            file://link_fribidi.patch \
            "
-SRC_URI[sha256sum] = "f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa"
+SRC_URI[sha256sum] = "ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
-- 
2.31.1

[PATCH 12/21] harfbuzz: upgrade 2.8.1 -> 2.8.2

[Alexander Kanavin]

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...ariable-supp_size-from-plan_subset_e.patch | 44 -------------------
 .../{harfbuzz_2.8.1.bb => harfbuzz_2.8.2.bb}  | 11 +++--
 2 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_2.8.1.bb => harfbuzz_2.8.2.bb} (84%)

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch
deleted file mode 100644
index c1d4df42a9..0000000000
--- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f96b2b653c605679b83a820b38f49a0a0f4baf42 Mon Sep 17 00:00:00 2001
-From: Andi-Bogdan Postelnicu <abpostelnicu@me.com>
-Date: Wed, 2 Jun 2021 14:08:11 +0300
-Subject: [PATCH] Removed unused variable `supp_size` from
- plan_subset_encoding(...).
-
-Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/243d056ff1c2af583ceb67e5dfbfaac51dc96e63]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/hb-subset-cff1.cc | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
-index df322f8..35dae7b 100644
---- a/src/hb-subset-cff1.cc
-+++ b/src/hb-subset-cff1.cc
-@@ -402,7 +402,7 @@ struct cff_subset_plan {
-   void plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan)
-   {
-     const Encoding *encoding = acc.encoding;
--    unsigned int  size0, size1, supp_size;
-+    unsigned int  size0, size1;
-     hb_codepoint_t  code, last_code = CFF_UNDEF_CODE;
-     hb_vector_t<hb_codepoint_t> supp_codes;
- 
-@@ -412,7 +412,6 @@ struct cff_subset_plan {
-       return;
-     }
- 
--    supp_size = 0;
-     supp_codes.init ();
- 
-     subset_enc_num_codes = plan->num_output_glyphs () - 1;
-@@ -448,7 +447,6 @@ struct cff_subset_plan {
- 	  code_pair_t pair = { supp_codes[i], sid };
- 	  subset_enc_supp_codes.push (pair);
- 	}
--	supp_size += SuppEncoding::static_size * supp_codes.length;
-       }
-     }
-     supp_codes.fini ();
--- 
-2.31.1
-
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb
similarity index 84%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb
index 1a0e651f6e..6da76ad0a3 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb
@@ -4,16 +4,15 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz"
 BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz"
 SECTION = "libs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8f787620b7d3866d9552fd1924c07572 \
-                    file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
+                    file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \
+                    "
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar"
 
-SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \
-           file://0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch \
-           "
-SRC_URI[sha256sum] = "4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300"
+SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz"
+SRC_URI[sha256sum] = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7"
 
 inherit meson pkgconfig lib_package gtk-doc gobject-introspection
 
-- 
2.31.1

[PATCH 13/21] iproute2: upgrade 5.12.0 -> 5.13.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../iproute2/{iproute2_5.12.0.bb => iproute2_5.13.0.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-connectivity/iproute2/{iproute2_5.12.0.bb => iproute2_5.13.0.bb} (75%)

diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.12.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.13.0.bb
similarity index 75%
rename from meta/recipes-connectivity/iproute2/iproute2_5.12.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_5.13.0.bb
index 3631123374..b117637e36 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_5.12.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_5.13.0.bb
@@ -4,7 +4,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
            file://0001-libc-compat.h-add-musl-workaround.patch \
            "
 
-SRC_URI[sha256sum] = "9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f"
+SRC_URI[sha256sum] = "72a2e53774cac9e65f7b617deebb2059f87e8960d6e9713e4d788cea966f1b36"
 
 # CFLAGS are computed in Makefile and reference CCOPTS
 #
-- 
2.31.1

[PATCH 14/21] libgit2: upgrade 1.1.0 -> 1.1.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../libgit2/{libgit2_1.1.0.bb => libgit2_1.1.1.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/libgit2/{libgit2_1.1.0.bb => libgit2_1.1.1.bb} (91%)

diff --git a/meta/recipes-support/libgit2/libgit2_1.1.0.bb b/meta/recipes-support/libgit2/libgit2_1.1.1.bb
similarity index 91%
rename from meta/recipes-support/libgit2/libgit2_1.1.0.bb
rename to meta/recipes-support/libgit2/libgit2_1.1.1.bb
index 2bbf59ea74..ae30a7a100 100644
--- a/meta/recipes-support/libgit2/libgit2_1.1.0.bb
+++ b/meta/recipes-support/libgit2/libgit2_1.1.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e"
 DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2"
 
 SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.1"
-SRCREV = "7f4fa178629d559c037a1f72f79f79af9c1ef8ce"
+SRCREV = "8a0dc6783c340e61a44c179c48f832165ad2053c"
 
 S = "${WORKDIR}/git"
 
-- 
2.31.1

[PATCH 15/21] mpg123: upgrade 1.28.0 -> 1.28.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../mpg123/{mpg123_1.28.0.bb => mpg123_1.28.2.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.28.0.bb => mpg123_1.28.2.bb} (96%)

diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.28.0.bb b/meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb
similarity index 96%
rename from meta/recipes-multimedia/mpg123/mpg123_1.28.0.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb
index 143a59ba63..ebe11d4138 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.28.0.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb
@@ -10,7 +10,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "e49466853685026da5d113dc7ff026b1b2ad0b57d78df693a446add9db88a7d5"
+SRC_URI[sha256sum] = "7eefd4b68fdac7e138d04c37efe12155a8ebf25a5bccf0fb7e775af22d21db00"
 
 UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
 
-- 
2.31.1

[PATCH 16/21] mtools: upgrade 4.0.31 -> 4.0.32

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../mtools/mtools/disable-hardcoded-configs.patch           | 6 +++---
 .../mtools/{mtools_4.0.31.bb => mtools_4.0.32.bb}           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/mtools/{mtools_4.0.31.bb => mtools_4.0.32.bb} (93%)

diff --git a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
index 7240a039e6..81d76d060e 100644
--- a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
+++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
@@ -1,4 +1,4 @@
-From 589a05f9377e3899082ced46c1736f90c0a4dc9b Mon Sep 17 00:00:00 2001
+From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001
 From: Ed Bartosh <ed.bartosh@linux.intel.com>
 Date: Tue, 13 Jun 2017 14:55:52 +0300
 Subject: [PATCH] Disabled reading host configs.
@@ -12,10 +12,10 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
  1 file changed, 8 deletions(-)
 
 diff --git a/config.c b/config.c
-index f91004b..b72f8ea 100644
+index bb13682..9186c77 100644
 --- a/config.c
 +++ b/config.c
-@@ -827,14 +827,6 @@ void read_config(void)
+@@ -836,14 +836,6 @@ void read_config(void)
  	memcpy(devices, const_devices,
  	       nr_const_devices*sizeof(struct device));
  
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.31.bb b/meta/recipes-devtools/mtools/mtools_4.0.32.bb
similarity index 93%
rename from meta/recipes-devtools/mtools/mtools_4.0.31.bb
rename to meta/recipes-devtools/mtools/mtools_4.0.32.bb
index 103036e518..501875037a 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.31.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.32.bb
@@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_libc-glibc = "\
 	glibc-gconv-ibm866 \
 	glibc-gconv-ibm869 \
 	"
-SRC_URI[sha256sum] = "538999277f8f2fa901f3898855d1b0ccb184666457fefddb70001cac612dd586"
+SRC_URI[sha256sum] = "62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89"
 
 SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
            file://mtools-makeinfo.patch \
-- 
2.31.1

[PATCH 17/21] ruby: upgrade 3.0.1 -> 3.0.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/ruby/{ruby_3.0.1.bb => ruby_3.0.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/ruby/{ruby_3.0.1.bb => ruby_3.0.2.bb} (97%)

diff --git a/meta/recipes-devtools/ruby/ruby_3.0.1.bb b/meta/recipes-devtools/ruby/ruby_3.0.2.bb
similarity index 97%
rename from meta/recipes-devtools/ruby/ruby_3.0.1.bb
rename to meta/recipes-devtools/ruby/ruby_3.0.2.bb
index 944cb81c1d..f88e874c7b 100644
--- a/meta/recipes-devtools/ruby/ruby_3.0.1.bb
+++ b/meta/recipes-devtools/ruby/ruby_3.0.2.bb
@@ -8,7 +8,7 @@ SRC_URI += " \
            file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \
            "
 
-SRC_URI[sha256sum] = "369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727"
+SRC_URI[sha256sum] = "5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
-- 
2.31.1

[PATCH 18/21] stress-ng: upgrade 0.12.11 -> 0.12.12

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../stress-ng/{stress-ng_0.12.11.bb => stress-ng_0.12.12.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/stress-ng/{stress-ng_0.12.11.bb => stress-ng_0.12.12.bb} (90%)

diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.12.11.bb b/meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb
similarity index 90%
rename from meta/recipes-extended/stress-ng/stress-ng_0.12.11.bb
rename to meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb
index d0cf45f42d..97eaa75d18 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.12.11.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb
@@ -9,7 +9,7 @@ SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \
            file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
            file://no_daddr_t.patch \
            "
-SRC_URI[sha256sum] = "971393075321c24c3d5769acfabb705911d1f411ced5937b7cfea58528c1b4e6"
+SRC_URI[sha256sum] = "f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499"
 
 DEPENDS = "coreutils-native"
 
-- 
2.31.1

[PATCH 19/21] webkitgtk: upgrade 2.32.1 -> 2.32.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 6 +++---
 .../webkit/{webkitgtk_2.32.1.bb => webkitgtk_2.32.2.bb}     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.32.1.bb => webkitgtk_2.32.2.bb} (98%)

diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
index efe286ed6b..21828a7ecf 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
@@ -1,4 +1,4 @@
-From af90ae1f128626e8d57a8bcbc432596bfc2987af Mon Sep 17 00:00:00 2001
+From 1a7becde0e508d7fac488bae6c08c1a4a0ac6b73 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 3 Feb 2020 17:06:27 -0800
 Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
@@ -20,11 +20,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index af6c0fac..f393d741 100644
+index 1f500299..0771af9c 100644
 --- a/Source/cmake/OptionsGTK.cmake
 +++ b/Source/cmake/OptionsGTK.cmake
 @@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN()
- SET_PROJECT_VERSION(2 32 1)
+ SET_PROJECT_VERSION(2 32 2)
  
  set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
 +set(THREADS_PREFER_PTHREAD_FLAG ON)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb
similarity index 98%
rename from meta/recipes-sato/webkit/webkitgtk_2.32.1.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.32.2.bb
index 7abf96c252..96b6cab49c 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.32.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb
@@ -22,7 +22,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch \
            "
 
-SRC_URI[sha256sum] = "136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917"
+SRC_URI[sha256sum] = "1790f86975bdef957ba9a12fc09202de8f55c885ee38467afc50d2bdb7a6c5cd"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
-- 
2.31.1

[PATCH 20/21] xwayland: upgrade 21.1.1 -> 21.1.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../xwayland/{xwayland_21.1.1.bb => xwayland_21.1.2.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/xwayland/{xwayland_21.1.1.bb => xwayland_21.1.2.bb} (95%)

diff --git a/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb b/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb
similarity index 95%
rename from meta/recipes-graphics/xwayland/xwayland_21.1.1.bb
rename to meta/recipes-graphics/xwayland/xwayland_21.1.2.bb
index f5db7cc5db..794a7bd98d 100644
--- a/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb
+++ b/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb
@@ -10,7 +10,7 @@ LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
 
 SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"
-SRC_URI[sha256sum] = "31f261ce51bbee76a6ca3ec02aa367ffa2b5efa2b98412df57ccefd7a19003ce"
+SRC_URI[sha256sum] = "b81cbdd5ad60b8b7ad8c3ecc7ec2a28c9bf021448670735cebb501f08bebd18b"
 
 UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
 
-- 
2.31.1

[PATCH 21/21] tcl: fix upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
index 57a86e4c64..8d58fafeb3 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
@@ -29,6 +29,8 @@ SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469
 
 SRC_URI_class-native = "${BASE_SRC_URI}"
 
+UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(\.\d+)+)-src"
+
 S = "${WORKDIR}/${BPN}${PV}"
 
 VER = "${PV}"
-- 
2.31.1