[PATCH 01/26] insane.bbclass: do not hardcode oe-core path in upstream-status check

[PATCH 01/26] insane.bbclass: do not hardcode oe-core path in upstream-status check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/classes/insane.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 240f3aad62..8a47da5a09 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1176,7 +1176,9 @@ python do_qa_patch() {
        (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url)
 
        # skip patches not in oe-core
-       if '/meta/' not in fullpath:
+       oecore_re = re.compile(d.getVar('BBFILE_PATTERN_core'))
+       match_oecore = oecore_re.search(fullpath)
+       if not match_oecore:
            continue
 
        content = open(fullpath, encoding='utf-8', errors='ignore').read()
-- 
2.20.1

[PATCH 02/26] perl: replace a patch with a config option

[Alexander Kanavin]

Instead of patching in LDFLAGS into makefiles, simply
append them to 'lddlflags' (perl's keyword for 'linker flags').

See here for upstream discussions:
https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/pull/406
https://github.com/arsv/perl-cross/pull/124

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...er-add-LDFLAGS-when-linking-binary-m.patch | 26 -------------------
 meta/recipes-devtools/perl/perl_5.34.0.bb     |  4 ++-
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch

diff --git a/meta/recipes-devtools/perl/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch b/meta/recipes-devtools/perl/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch
deleted file mode 100644
index 1acf3ddfaa..0000000000
--- a/meta/recipes-devtools/perl/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2f74a899474f428a4a5368a94accf801c5f97ae4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 4 Jun 2018 18:33:50 +0300
-Subject: [PATCH] ExtUtils-MakeMaker: add $(LDFLAGS) when linking binary
- modules
-
-Upstream-Status: Submitted [https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/pull/405]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index fe53be1..249c048 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -1050,7 +1050,7 @@ sub xs_make_dynamic_lib {
-     }
- 
-     push @m, sprintf <<'MAKE', $ld_run_path_shell, $ldrun, $dlsyms_arg, $ldfrom, $self->xs_obj_opt('$@'), $libs, $exportlist;
--	%s$(LD) %s $(LDDLFLAGS) %s %s $(OTHERLDFLAGS) %s $(MYEXTLIB) \
-+	%s$(LD) %s $(LDDLFLAGS) %s %s $(LDFLAGS) $(OTHERLDFLAGS) %s $(MYEXTLIB) \
- 	  $(PERL_ARCHIVE) %s $(PERL_ARCHIVE_AFTER) %s \
- 	  $(INST_DYNAMIC_FIX)
- 	$(CHMOD) $(PERM_RWX) $@
diff --git a/meta/recipes-devtools/perl/perl_5.34.0.bb b/meta/recipes-devtools/perl/perl_5.34.0.bb
index 16d45ccff3..a6ae80f07e 100644
--- a/meta/recipes-devtools/perl/perl_5.34.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.34.0.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 
 SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
            file://perl-rdepends.txt \
-           file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
            file://0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch \
            file://errno_ver.diff \
            file://native-perlinc.patch \
@@ -59,6 +58,7 @@ do_configure:class-target() {
     -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \
     -Dlibpth='${libdir} ${base_libdir}' \
     -Dglibpth='${libdir} ${base_libdir}' \
+    -Alddlflags=' ${LDFLAGS}' \
     ${PACKAGECONFIG_CONFARGS}
 
     #perl.c uses an ARCHLIB_EXP define to generate compile-time code that
@@ -83,6 +83,7 @@ do_configure:class-nativesdk() {
     -Dsoname=libperl.so.5 \
     -Dvendorprefix=${prefix} \
     -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \
+    -Alddlflags=' ${LDFLAGS}' \
     ${PACKAGECONFIG_CONFARGS}
 
     # See the comment above
@@ -96,6 +97,7 @@ do_configure:class-native() {
     -Dsoname=libperl.so.5 \
     -Dvendorprefix=${prefix} \
     -Ui_xlocale \
+    -Alddlflags=' ${LDFLAGS}' \
     ${PACKAGECONFIG_CONFARGS}
 }
 
-- 
2.20.1

[PATCH 03/26] meson: configure and use generic exe_wrapper

[Alexander Kanavin]

This replaces the specific gtkdoc wrapper setting
(which was rejected by upstream in https://github.com/mesonbuild/meson/pull/9627)
with a generic, officially supported and documented exe_wrapper,
which is enabled subject to qemu usermode support
(just as is done for g-i and gtk-doc with autotools).

gtk-doc support is adjusted so that this wrapper is passed to
meson's gtk-doc module, which passes it to gtk-doc.

The adjusted patch is re-submitted upstream.

The side effect of this is that meson is now able to run
target binaries in a generic way when it wants to, so this
may affect cross-builds - hopefully in a positive way.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/classes/meson.bbclass                    | 30 +++++++++++++++++--
 ...sues-that-arise-when-cross-compiling.patch | 27 +++++++++++------
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index a7981e481f..ffec5f3269 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -1,7 +1,12 @@
-inherit python3native meson-routines
+inherit python3native meson-routines qemu
 
 DEPENDS:append = " meson-native ninja-native"
 
+EXEWRAPPER_ENABLED:class-native = "False"
+EXEWRAPPER_ENABLED:class-nativesdk = "False"
+EXEWRAPPER_ENABLED ?= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d)}"
+DEPENDS:append = "${@' qemu-native' if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ''}"
+
 # As Meson enforces out-of-tree builds we can just use cleandirs
 B = "${WORKDIR}/build"
 do_configure[cleandirs] = "${B}"
@@ -36,6 +41,9 @@ MESON_CROSS_FILE = ""
 MESON_CROSS_FILE:class-target = "--cross-file ${WORKDIR}/meson.cross"
 MESON_CROSS_FILE:class-nativesdk = "--cross-file ${WORKDIR}/meson.cross"
 
+# Needed to set up qemu wrapper below
+export STAGING_DIR_HOST
+
 def rust_tool(d, target_var):
     rustc = d.getVar('RUSTC')
     if not rustc:
@@ -62,6 +70,7 @@ cups-config = 'cups-config'
 g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
 g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper'
 ${@rust_tool(d, "HOST_SYS")}
+${@"exe_wrapper = '${WORKDIR}/meson-qemuwrapper'" if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ""}
 
 [built-in options]
 c_args = ${@meson_array('CFLAGS', d)}
@@ -71,7 +80,6 @@ cpp_link_args = ${@meson_array('LDFLAGS', d)}
 
 [properties]
 needs_exe_wrapper = true
-gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper'
 
 [host_machine]
 system = '${@meson_operating_system('HOST_OS', d)}'
@@ -106,6 +114,24 @@ cpp_link_args = ${@meson_array('BUILD_LDFLAGS', d)}
 EOF
 }
 
+do_write_config:append:class-target() {
+    # Write out a qemu wrapper that will be used as exe_wrapper so that meson
+    # can run target helper binaries through that.
+    qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
+    cat > ${WORKDIR}/meson-qemuwrapper << EOF
+#!/bin/sh
+# Use a modules directory which doesn't exist so we don't load random things
+# which may then get deleted (or their dependencies) and potentially segfault
+export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy
+
+# meson sets this wrongly (only to libs in build-dir), qemu-wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly
+unset LD_LIBRARY_PATH
+
+$qemu_binary "\$@"
+EOF
+    chmod +x ${WORKDIR}/meson-qemuwrapper
+}
+
 # Tell externalsrc that changes to this file require a reconfigure
 CONFIGURE_FILES = "meson.build"
 
diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
index ab4d5969d9..b098c4a123 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
@@ -1,29 +1,38 @@
-From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00 2001
+From bbdd6679e49bcba5ec022b240ac234a87b451e41 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 4 Aug 2017 16:16:41 +0300
-Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
+Subject: [PATCH] gtkdoc: add support for a binary wrapper
 
 Make it possible to specify a wrapper for executing binaries
+in cross-compiling scenarios.
 (usually, some kind of target hardware emulator, such as qemu)
 
 Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/9627]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 ---
- mesonbuild/modules/gnome.py | 4 ++++
- 1 file changed, 4 insertions(+)
+ mesonbuild/modules/gnome.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index dc2979e..c9ff9bd 100644
+index 1c6952d..5a6ff94 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
+@@ -35,7 +35,7 @@ from ..mesonlib import (
+ from ..dependencies import Dependency, PkgConfigDependency, InternalDependency
+ from ..interpreterbase import noPosargs, noKwargs, permittedKwargs, FeatureNew, FeatureNewKwargs, FeatureDeprecatedKwargs, FeatureDeprecated
+ from ..interpreterbase import typed_kwargs, KwargInfo, ContainerTypeInfo
+-from ..programs import ExternalProgram, OverrideProgram
++from ..programs import ExternalProgram, OverrideProgram, EmptyExternalProgram
+ from ..build import CustomTarget, CustomTargetIndex, GeneratedList
+ 
+ if T.TYPE_CHECKING:
+@@ -1103,6 +1103,9 @@ class GnomeModule(ExtensionModule):
              args.append(f'--{program_name}={path}')
          if namespace:
              args.append('--namespace=' + namespace)
-+        gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
-+        if gtkdoc_exe_wrapper is not None:
-+            args.append('--run=' + gtkdoc_exe_wrapper)
++        if state.environment.need_exe_wrapper() and not isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
++            args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
 +
          args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
          args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
-- 
2.20.1

Re: [OE-core] [PATCH 03/26] meson: configure and use generic exe_wrapper

[Hsia-Jun Li]

On 12/4/21 15:13, Alexander Kanavin wrote:
> CAUTION: Email originated externally, do not click links or open attachments unless you recognize the sender and know the content is safe.
> 
> 
> This replaces the specific gtkdoc wrapper setting
> (which was rejected by upstream in https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_pull_9627&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=d8BltpV_tYTB24NoB22HJJW4KZkMUZszeTnLXy4O-MA&e= )
> with a generic, officially supported and documented exe_wrapper,
> which is enabled subject to qemu usermode support
> (just as is done for g-i and gtk-doc with autotools).
> 
> gtk-doc support is adjusted so that this wrapper is passed to
> meson's gtk-doc module, which passes it to gtk-doc.
> 
> The adjusted patch is re-submitted upstream.
> 
> The side effect of this is that meson is now able to run
> target binaries in a generic way when it wants to, so this
> may affect cross-builds - hopefully in a positive way.

Unfortunately, the meta layer I made for android native would be the 
victim of that.

| DEBUG: Executing shell function do_configure
| NOTE: Executing meson ...
| qemu-arm: Could not open '/system/bin/linker': No such file or directory
| The Meson build system
| Version: 0.60.1

I am not sure how I should make qemu usermode be compatible with the 
Android environment. I just add "qemu-usermode" into 
MACHINE_FEATURES_BACKFILL_CONSIDERED in the machine configure of the 
meta-android-ndk.

I should report this more early but I can't spend much time on this 
android project.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>   meta/classes/meson.bbclass                    | 30 +++++++++++++++++--
>   ...sues-that-arise-when-cross-compiling.patch | 27 +++++++++++------
>   2 files changed, 46 insertions(+), 11 deletions(-)
> 
> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
> index a7981e481f..ffec5f3269 100644
> --- a/meta/classes/meson.bbclass
> +++ b/meta/classes/meson.bbclass
> @@ -1,7 +1,12 @@
> -inherit python3native meson-routines
> +inherit python3native meson-routines qemu
> 
>   DEPENDS:append = " meson-native ninja-native"
> 
> +EXEWRAPPER_ENABLED:class-native = "False"
> +EXEWRAPPER_ENABLED:class-nativesdk = "False"
> +EXEWRAPPER_ENABLED ?= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d)}"
> +DEPENDS:append = "${@' qemu-native' if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ''}"
> +
>   # As Meson enforces out-of-tree builds we can just use cleandirs
>   B = "${WORKDIR}/build"
>   do_configure[cleandirs] = "${B}"
> @@ -36,6 +41,9 @@ MESON_CROSS_FILE = ""
>   MESON_CROSS_FILE:class-target = "--cross-file ${WORKDIR}/meson.cross"
>   MESON_CROSS_FILE:class-nativesdk = "--cross-file ${WORKDIR}/meson.cross"
> 
> +# Needed to set up qemu wrapper below
> +export STAGING_DIR_HOST
> +
>   def rust_tool(d, target_var):
>       rustc = d.getVar('RUSTC')
>       if not rustc:
> @@ -62,6 +70,7 @@ cups-config = 'cups-config'
>   g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
>   g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper'
>   ${@rust_tool(d, "HOST_SYS")}
> +${@"exe_wrapper = '${WORKDIR}/meson-qemuwrapper'" if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ""}
> 
>   [built-in options]
>   c_args = ${@meson_array('CFLAGS', d)}
> @@ -71,7 +80,6 @@ cpp_link_args = ${@meson_array('LDFLAGS', d)}
> 
>   [properties]
>   needs_exe_wrapper = true
> -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper'
> 
>   [host_machine]
>   system = '${@meson_operating_system('HOST_OS', d)}'
> @@ -106,6 +114,24 @@ cpp_link_args = ${@meson_array('BUILD_LDFLAGS', d)}
>   EOF
>   }
> 
> +do_write_config:append:class-target() {
> +    # Write out a qemu wrapper that will be used as exe_wrapper so that meson
> +    # can run target helper binaries through that.
> +    qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
> +    cat > ${WORKDIR}/meson-qemuwrapper << EOF
> +#!/bin/sh
> +# Use a modules directory which doesn't exist so we don't load random things
> +# which may then get deleted (or their dependencies) and potentially segfault
> +export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy
> +
> +# meson sets this wrongly (only to libs in build-dir), qemu-wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly
> +unset LD_LIBRARY_PATH
> +
> +$qemu_binary "\$@"
> +EOF
> +    chmod +x ${WORKDIR}/meson-qemuwrapper
> +}
> +
>   # Tell externalsrc that changes to this file require a reconfigure
>   CONFIGURE_FILES = "meson.build"
> 
> diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> index ab4d5969d9..b098c4a123 100644
> --- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> +++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> @@ -1,29 +1,38 @@
> -From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00 2001
> +From bbdd6679e49bcba5ec022b240ac234a87b451e41 Mon Sep 17 00:00:00 2001
>   From: Alexander Kanavin <alex.kanavin@gmail.com>
>   Date: Fri, 4 Aug 2017 16:16:41 +0300
> -Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
> +Subject: [PATCH] gtkdoc: add support for a binary wrapper
> 
>   Make it possible to specify a wrapper for executing binaries
> +in cross-compiling scenarios.
>   (usually, some kind of target hardware emulator, such as qemu)
> 
>   Upstream-Status: Submitted [https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_pull_9627&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=d8BltpV_tYTB24NoB22HJJW4KZkMUZszeTnLXy4O-MA&e= ]
>   Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 
>   ---
> - mesonbuild/modules/gnome.py | 4 ++++
> - 1 file changed, 4 insertions(+)
> + mesonbuild/modules/gnome.py | 5 ++++-
> + 1 file changed, 4 insertions(+), 1 deletion(-)
> 
>   diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
> -index dc2979e..c9ff9bd 100644
> +index 1c6952d..5a6ff94 100644
>   --- a/mesonbuild/modules/gnome.py
>   +++ b/mesonbuild/modules/gnome.py
> -@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
> +@@ -35,7 +35,7 @@ from ..mesonlib import (
> + from ..dependencies import Dependency, PkgConfigDependency, InternalDependency
> + from ..interpreterbase import noPosargs, noKwargs, permittedKwargs, FeatureNew, FeatureNewKwargs, FeatureDeprecatedKwargs, FeatureDeprecated
> + from ..interpreterbase import typed_kwargs, KwargInfo, ContainerTypeInfo
> +-from ..programs import ExternalProgram, OverrideProgram
> ++from ..programs import ExternalProgram, OverrideProgram, EmptyExternalProgram
> + from ..build import CustomTarget, CustomTargetIndex, GeneratedList
> +
> + if T.TYPE_CHECKING:
> +@@ -1103,6 +1103,9 @@ class GnomeModule(ExtensionModule):
>                args.append(f'--{program_name}={path}')
>            if namespace:
>                args.append('--namespace=' + namespace)
> -+        gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
> -+        if gtkdoc_exe_wrapper is not None:
> -+            args.append('--run=' + gtkdoc_exe_wrapper)
> ++        if state.environment.need_exe_wrapper() and not isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
> ++            args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
>   +
>            args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
>            args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
> --
> 2.20.1
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159150): https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_159150&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=45V6_TRrNONJsAD5I2vogAQnnZusJBFo0xgaXn91aC8&e=
> Mute This Topic: https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_87494764_6350696&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=r1-DZP8UnKe5blruwC2xC0yCg4vPMbgdQB7csVRG5FI&e=
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=aCJ012s9D9DQ3yG-GuuQFs_6APt34sTiwSp8typpm6Q&e=  [randy.li@synaptics.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

-- 
Hsia-Jun(Randy) Li

Re: [OE-core] [PATCH 03/26] meson: configure and use generic exe_wrapper

[Alexander Kanavin]

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

It seems like the issue is not that qemu can't run the executable, it's
that executable it wants to run is not there. I'm not sure why it wants to
run something in a 'system' location through qemu, as I do not have access
to your layer.

If qemu-usermode is not in MACHINE_FEATURES, then the wrapper is not
configured at all, and so things should go back to what they were. Can you
check that it's not?

Alex

On Wed, 8 Dec 2021 at 10:27, Hsia-Jun Li <Randy.Li@synaptics.com> wrote:

>
>
> On 12/4/21 15:13, Alexander Kanavin wrote:
> > CAUTION: Email originated externally, do not click links or open
> attachments unless you recognize the sender and know the content is safe.
> >
> >
> > This replaces the specific gtkdoc wrapper setting
> > (which was rejected by upstream in
> https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_pull_9627&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=d8BltpV_tYTB24NoB22HJJW4KZkMUZszeTnLXy4O-MA&e=
> )
> > with a generic, officially supported and documented exe_wrapper,
> > which is enabled subject to qemu usermode support
> > (just as is done for g-i and gtk-doc with autotools).
> >
> > gtk-doc support is adjusted so that this wrapper is passed to
> > meson's gtk-doc module, which passes it to gtk-doc.
> >
> > The adjusted patch is re-submitted upstream.
> >
> > The side effect of this is that meson is now able to run
> > target binaries in a generic way when it wants to, so this
> > may affect cross-builds - hopefully in a positive way.
>
> Unfortunately, the meta layer I made for android native would be the
> victim of that.
>
> | DEBUG: Executing shell function do_configure
> | NOTE: Executing meson ...
> | qemu-arm: Could not open '/system/bin/linker': No such file or directory
> | The Meson build system
> | Version: 0.60.1
>
> I am not sure how I should make qemu usermode be compatible with the
> Android environment. I just add "qemu-usermode" into
> MACHINE_FEATURES_BACKFILL_CONSIDERED in the machine configure of the
> meta-android-ndk.
>
> I should report this more early but I can't spend much time on this
> android project.
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >   meta/classes/meson.bbclass                    | 30 +++++++++++++++++--
> >   ...sues-that-arise-when-cross-compiling.patch | 27 +++++++++++------
> >   2 files changed, 46 insertions(+), 11 deletions(-)
> >
> > diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
> > index a7981e481f..ffec5f3269 100644
> > --- a/meta/classes/meson.bbclass
> > +++ b/meta/classes/meson.bbclass
> > @@ -1,7 +1,12 @@
> > -inherit python3native meson-routines
> > +inherit python3native meson-routines qemu
> >
> >   DEPENDS:append = " meson-native ninja-native"
> >
> > +EXEWRAPPER_ENABLED:class-native = "False"
> > +EXEWRAPPER_ENABLED:class-nativesdk = "False"
> > +EXEWRAPPER_ENABLED ?= "${@bb.utils.contains('MACHINE_FEATURES',
> 'qemu-usermode', 'True', 'False', d)}"
> > +DEPENDS:append = "${@' qemu-native' if d.getVar('EXEWRAPPER_ENABLED')
> == 'True' else ''}"
> > +
> >   # As Meson enforces out-of-tree builds we can just use cleandirs
> >   B = "${WORKDIR}/build"
> >   do_configure[cleandirs] = "${B}"
> > @@ -36,6 +41,9 @@ MESON_CROSS_FILE = ""
> >   MESON_CROSS_FILE:class-target = "--cross-file ${WORKDIR}/meson.cross"
> >   MESON_CROSS_FILE:class-nativesdk = "--cross-file
> ${WORKDIR}/meson.cross"
> >
> > +# Needed to set up qemu wrapper below
> > +export STAGING_DIR_HOST
> > +
> >   def rust_tool(d, target_var):
> >       rustc = d.getVar('RUSTC')
> >       if not rustc:
> > @@ -62,6 +70,7 @@ cups-config = 'cups-config'
> >   g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
> >   g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper'
> >   ${@rust_tool(d, "HOST_SYS")}
> > +${@"exe_wrapper = '${WORKDIR}/meson-qemuwrapper'" if
> d.getVar('EXEWRAPPER_ENABLED') == 'True' else ""}
> >
> >   [built-in options]
> >   c_args = ${@meson_array('CFLAGS', d)}
> > @@ -71,7 +80,6 @@ cpp_link_args = ${@meson_array('LDFLAGS', d)}
> >
> >   [properties]
> >   needs_exe_wrapper = true
> > -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper'
> >
> >   [host_machine]
> >   system = '${@meson_operating_system('HOST_OS', d)}'
> > @@ -106,6 +114,24 @@ cpp_link_args = ${@meson_array('BUILD_LDFLAGS', d)}
> >   EOF
> >   }
> >
> > +do_write_config:append:class-target() {
> > +    # Write out a qemu wrapper that will be used as exe_wrapper so that
> meson
> > +    # can run target helper binaries through that.
> > +    qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST',
> ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
> > +    cat > ${WORKDIR}/meson-qemuwrapper << EOF
> > +#!/bin/sh
> > +# Use a modules directory which doesn't exist so we don't load random
> things
> > +# which may then get deleted (or their dependencies) and potentially
> segfault
> > +export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy
> > +
> > +# meson sets this wrongly (only to libs in build-dir),
> qemu-wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly
> > +unset LD_LIBRARY_PATH
> > +
> > +$qemu_binary "\$@"
> > +EOF
> > +    chmod +x ${WORKDIR}/meson-qemuwrapper
> > +}
> > +
> >   # Tell externalsrc that changes to this file require a reconfigure
> >   CONFIGURE_FILES = "meson.build"
> >
> > diff --git
> a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> > index ab4d5969d9..b098c4a123 100644
> > ---
> a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> > +++
> b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> > @@ -1,29 +1,38 @@
> > -From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00 2001
> > +From bbdd6679e49bcba5ec022b240ac234a87b451e41 Mon Sep 17 00:00:00 2001
> >   From: Alexander Kanavin <alex.kanavin@gmail.com>
> >   Date: Fri, 4 Aug 2017 16:16:41 +0300
> > -Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
> > +Subject: [PATCH] gtkdoc: add support for a binary wrapper
> >
> >   Make it possible to specify a wrapper for executing binaries
> > +in cross-compiling scenarios.
> >   (usually, some kind of target hardware emulator, such as qemu)
> >
> >   Upstream-Status: Submitted [
> https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_pull_9627&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=d8BltpV_tYTB24NoB22HJJW4KZkMUZszeTnLXy4O-MA&e=
> ]
> >   Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> >
> >   ---
> > - mesonbuild/modules/gnome.py | 4 ++++
> > - 1 file changed, 4 insertions(+)
> > + mesonbuild/modules/gnome.py | 5 ++++-
> > + 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> >   diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
> > -index dc2979e..c9ff9bd 100644
> > +index 1c6952d..5a6ff94 100644
> >   --- a/mesonbuild/modules/gnome.py
> >   +++ b/mesonbuild/modules/gnome.py
> > -@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
> > +@@ -35,7 +35,7 @@ from ..mesonlib import (
> > + from ..dependencies import Dependency, PkgConfigDependency,
> InternalDependency
> > + from ..interpreterbase import noPosargs, noKwargs, permittedKwargs,
> FeatureNew, FeatureNewKwargs, FeatureDeprecatedKwargs, FeatureDeprecated
> > + from ..interpreterbase import typed_kwargs, KwargInfo,
> ContainerTypeInfo
> > +-from ..programs import ExternalProgram, OverrideProgram
> > ++from ..programs import ExternalProgram, OverrideProgram,
> EmptyExternalProgram
> > + from ..build import CustomTarget, CustomTargetIndex, GeneratedList
> > +
> > + if T.TYPE_CHECKING:
> > +@@ -1103,6 +1103,9 @@ class GnomeModule(ExtensionModule):
> >                args.append(f'--{program_name}={path}')
> >            if namespace:
> >                args.append('--namespace=' + namespace)
> > -+        gtkdoc_exe_wrapper =
> state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
> > -+        if gtkdoc_exe_wrapper is not None:
> > -+            args.append('--run=' + gtkdoc_exe_wrapper)
> > ++        if state.environment.need_exe_wrapper() and not
> isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
> > ++            args.append('--run=' + '
> '.join(state.environment.get_exe_wrapper().get_command()))
> >   +
> >            args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
> >            args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
> > --
> > 2.20.1
> >
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#159150):
> https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_159150&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=45V6_TRrNONJsAD5I2vogAQnnZusJBFo0xgaXn91aC8&e=
> > Mute This Topic:
> https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_87494764_6350696&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=r1-DZP8UnKe5blruwC2xC0yCg4vPMbgdQB7csVRG5FI&e=
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe:
> https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=aCJ012s9D9DQ3yG-GuuQFs_6APt34sTiwSp8typpm6Q&e=
> [randy.li@synaptics.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
> --
> Hsia-Jun(Randy) Li
>

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

Re: [OE-core] [PATCH 03/26] meson: configure and use generic exe_wrapper

[Hsia-Jun Li]

On 12/8/21 17:32, Alexander Kanavin wrote:
> CAUTION: Email originated externally, do not click links or open 
> attachments unless you recognize the sender and know the content is safe.
> 
> It seems like the issue is not that qemu can't run the executable, it's 
> that executable it wants to run is not there. I'm not sure why it wants 
> to run something in a 'system' location through qemu, as I do not have 
> access to your layer.
/system/bin/linker is the dynamic linker in Android system.
https://android.googlesource.com/platform/bionic/
Of course it won't be there, it even doesn't exist in the toolchains.

That layer for android ndk is hosted here
https://github.com/hizukiayaka/meta-android-ndk

> 
> If qemu-usermode is not in MACHINE_FEATURES, then the wrapper is not 
> configured at all, and so things should go back to what they were. Can 
> you check that it's not?

Sorry, I don't understand what I could check.
The exe_wrapper option in meson cross file would disappear when that 
feature is removed. And everything would be fine then.
> 
> Alex
> 
> On Wed, 8 Dec 2021 at 10:27, Hsia-Jun Li <Randy.Li@synaptics.com 
> <mailto:Randy.Li@synaptics.com>> wrote:
> 
> 
> 
>     On 12/4/21 15:13, Alexander Kanavin wrote:
>      > CAUTION: Email originated externally, do not click links or open
>     attachments unless you recognize the sender and know the content is
>     safe.
>      >
>      >
>      > This replaces the specific gtkdoc wrapper setting
>      > (which was rejected by upstream in
>     https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_pull_9627&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=d8BltpV_tYTB24NoB22HJJW4KZkMUZszeTnLXy4O-MA&e=
>     <https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_pull_9627&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=d8BltpV_tYTB24NoB22HJJW4KZkMUZszeTnLXy4O-MA&e=>
>     )
>      > with a generic, officially supported and documented exe_wrapper,
>      > which is enabled subject to qemu usermode support
>      > (just as is done for g-i and gtk-doc with autotools).
>      >
>      > gtk-doc support is adjusted so that this wrapper is passed to
>      > meson's gtk-doc module, which passes it to gtk-doc.
>      >
>      > The adjusted patch is re-submitted upstream.
>      >
>      > The side effect of this is that meson is now able to run
>      > target binaries in a generic way when it wants to, so this
>      > may affect cross-builds - hopefully in a positive way.
> 
>     Unfortunately, the meta layer I made for android native would be the
>     victim of that.
> 
>     | DEBUG: Executing shell function do_configure
>     | NOTE: Executing meson ...
>     | qemu-arm: Could not open '/system/bin/linker': No such file or
>     directory
>     | The Meson build system
>     | Version: 0.60.1
> 
>     I am not sure how I should make qemu usermode be compatible with the
>     Android environment. I just add "qemu-usermode" into
>     MACHINE_FEATURES_BACKFILL_CONSIDERED in the machine configure of the
>     meta-android-ndk.
> 
>     I should report this more early but I can't spend much time on this
>     android project.
>      >
>      > Signed-off-by: Alexander Kanavin <alex@linutronix.de
>     <mailto:alex@linutronix.de>>
>      > ---
>      >   meta/classes/meson.bbclass                    | 30
>     +++++++++++++++++--
>      >   ...sues-that-arise-when-cross-compiling.patch | 27
>     +++++++++++------
>      >   2 files changed, 46 insertions(+), 11 deletions(-)
>      >
>      > diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
>      > index a7981e481f..ffec5f3269 100644
>      > --- a/meta/classes/meson.bbclass
>      > +++ b/meta/classes/meson.bbclass
>      > @@ -1,7 +1,12 @@
>      > -inherit python3native meson-routines
>      > +inherit python3native meson-routines qemu
>      >
>      >   DEPENDS:append = " meson-native ninja-native"
>      >
>      > +EXEWRAPPER_ENABLED:class-native = "False"
>      > +EXEWRAPPER_ENABLED:class-nativesdk = "False"
>      > +EXEWRAPPER_ENABLED ?= "${@bb.utils.contains('MACHINE_FEATURES',
>     'qemu-usermode', 'True', 'False', d)}"
>      > +DEPENDS:append = "${@' qemu-native' if
>     d.getVar('EXEWRAPPER_ENABLED') == 'True' else ''}"
>      > +
>      >   # As Meson enforces out-of-tree builds we can just use cleandirs
>      >   B = "${WORKDIR}/build"
>      >   do_configure[cleandirs] = "${B}"
>      > @@ -36,6 +41,9 @@ MESON_CROSS_FILE = ""
>      >   MESON_CROSS_FILE:class-target = "--cross-file
>     ${WORKDIR}/meson.cross"
>      >   MESON_CROSS_FILE:class-nativesdk = "--cross-file
>     ${WORKDIR}/meson.cross"
>      >
>      > +# Needed to set up qemu wrapper below
>      > +export STAGING_DIR_HOST
>      > +
>      >   def rust_tool(d, target_var):
>      >       rustc = d.getVar('RUSTC')
>      >       if not rustc:
>      > @@ -62,6 +70,7 @@ cups-config = 'cups-config'
>      >   g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
>      >   g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper'
>      >   ${@rust_tool(d, "HOST_SYS")}
>      > +${@"exe_wrapper = '${WORKDIR}/meson-qemuwrapper'" if
>     d.getVar('EXEWRAPPER_ENABLED') == 'True' else ""}
>      >
>      >   [built-in options]
>      >   c_args = ${@meson_array('CFLAGS', d)}
>      > @@ -71,7 +80,6 @@ cpp_link_args = ${@meson_array('LDFLAGS', d)}
>      >
>      >   [properties]
>      >   needs_exe_wrapper = true
>      > -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper'
>      >
>      >   [host_machine]
>      >   system = '${@meson_operating_system('HOST_OS', d)}'
>      > @@ -106,6 +114,24 @@ cpp_link_args =
>     ${@meson_array('BUILD_LDFLAGS', d)}
>      >   EOF
>      >   }
>      >
>      > +do_write_config:append:class-target() {
>      > +    # Write out a qemu wrapper that will be used as exe_wrapper
>     so that meson
>      > +    # can run target helper binaries through that.
>      > +    qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST',
>     ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
>      > +    cat > ${WORKDIR}/meson-qemuwrapper << EOF
>      > +#!/bin/sh
>      > +# Use a modules directory which doesn't exist so we don't load
>     random things
>      > +# which may then get deleted (or their dependencies) and
>     potentially segfault
>      > +export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy
>      > +
>      > +# meson sets this wrongly (only to libs in build-dir),
>     qemu-wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly
>      > +unset LD_LIBRARY_PATH
>      > +
>      > +$qemu_binary "\$@"
>      > +EOF
>      > +    chmod +x ${WORKDIR}/meson-qemuwrapper
>      > +}
>      > +
>      >   # Tell externalsrc that changes to this file require a reconfigure
>      >   CONFIGURE_FILES = "meson.build"
>      >
>      > diff --git
>     a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
>     b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
>      > index ab4d5969d9..b098c4a123 100644
>      > ---
>     a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
>      > +++
>     b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
>      > @@ -1,29 +1,38 @@
>      > -From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17
>     00:00:00 2001
>      > +From bbdd6679e49bcba5ec022b240ac234a87b451e41 Mon Sep 17
>     00:00:00 2001
>      >   From: Alexander Kanavin <alex.kanavin@gmail.com
>     <mailto:alex.kanavin@gmail.com>>
>      >   Date: Fri, 4 Aug 2017 16:16:41 +0300
>      > -Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
>      > +Subject: [PATCH] gtkdoc: add support for a binary wrapper
>      >
>      >   Make it possible to specify a wrapper for executing binaries
>      > +in cross-compiling scenarios.
>      >   (usually, some kind of target hardware emulator, such as qemu)
>      >
>      >   Upstream-Status: Submitted
>     [https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_pull_9627&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=d8BltpV_tYTB24NoB22HJJW4KZkMUZszeTnLXy4O-MA&e=
>     <https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_mesonbuild_meson_pull_9627&d=DwIDAg&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=d8BltpV_tYTB24NoB22HJJW4KZkMUZszeTnLXy4O-MA&e=>
>     ]
>      >   Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com
>     <mailto:alex.kanavin@gmail.com>>
>      >
>      >   ---
>      > - mesonbuild/modules/gnome.py | 4 ++++
>      > - 1 file changed, 4 insertions(+)
>      > + mesonbuild/modules/gnome.py | 5 ++++-
>      > + 1 file changed, 4 insertions(+), 1 deletion(-)
>      >
>      >   diff --git a/mesonbuild/modules/gnome.py
>     b/mesonbuild/modules/gnome.py
>      > -index dc2979e..c9ff9bd 100644
>      > +index 1c6952d..5a6ff94 100644
>      >   --- a/mesonbuild/modules/gnome.py
>      >   +++ b/mesonbuild/modules/gnome.py
>      > -@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
>      > +@@ -35,7 +35,7 @@ from ..mesonlib import (
>      > + from ..dependencies import Dependency, PkgConfigDependency,
>     InternalDependency
>      > + from ..interpreterbase import noPosargs, noKwargs,
>     permittedKwargs, FeatureNew, FeatureNewKwargs,
>     FeatureDeprecatedKwargs, FeatureDeprecated
>      > + from ..interpreterbase import typed_kwargs, KwargInfo,
>     ContainerTypeInfo
>      > +-from ..programs import ExternalProgram, OverrideProgram
>      > ++from ..programs import ExternalProgram, OverrideProgram,
>     EmptyExternalProgram
>      > + from ..build import CustomTarget, CustomTargetIndex, GeneratedList
>      > +
>      > + if T.TYPE_CHECKING:
>      > +@@ -1103,6 +1103,9 @@ class GnomeModule(ExtensionModule):
>      >                args.append(f'--{program_name}={path}')
>      >            if namespace:
>      >                args.append('--namespace=' + namespace)
>      > -+        gtkdoc_exe_wrapper =
>     state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
>      > -+        if gtkdoc_exe_wrapper is not None:
>      > -+            args.append('--run=' + gtkdoc_exe_wrapper)
>      > ++        if state.environment.need_exe_wrapper() and not
>     isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
>      > ++            args.append('--run=' + '
>     '.join(state.environment.get_exe_wrapper().get_command()))
>      >   +
>      >            args += self._unpack_args('--htmlargs=', 'html_args',
>     kwargs)
>      >            args += self._unpack_args('--scanargs=', 'scan_args',
>     kwargs)
>      > --
>      > 2.20.1
>      >
>      >
>      >
>      > -=-=-=-=-=-=-=-=-=-=-=-
>      > Links: You receive all messages sent to this group.
>      > View/Reply Online (#159150):
>     https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_159150&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=45V6_TRrNONJsAD5I2vogAQnnZusJBFo0xgaXn91aC8&e=
>     <https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_159150&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=45V6_TRrNONJsAD5I2vogAQnnZusJBFo0xgaXn91aC8&e=>
>      > Mute This Topic:
>     https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_87494764_6350696&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=r1-DZP8UnKe5blruwC2xC0yCg4vPMbgdQB7csVRG5FI&e=
>     <https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_87494764_6350696&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=r1-DZP8UnKe5blruwC2xC0yCg4vPMbgdQB7csVRG5FI&e=>
>      > Group Owner: openembedded-core+owner@lists.openembedded.org
>     <mailto:openembedded-core%2Bowner@lists.openembedded.org>
>      > Unsubscribe:
>     https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=aCJ012s9D9DQ3yG-GuuQFs_6APt34sTiwSp8typpm6Q&e=
>     <https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwIFaQ&c=7dfBJ8cXbWjhc0BhImu8wVIoUFmBzj1s88r8EGyM0UY&r=P4xb2_7biqBxD4LGGPrSV6j-jf3C3xlR7PXU-mLTeZE&m=CAFnH4fxB5TbFzRZLDRgLtKrp2ZzM4vwpRgeHylkuqrk5HT83nok425kJ_nXRe4e&s=aCJ012s9D9DQ3yG-GuuQFs_6APt34sTiwSp8typpm6Q&e=>
>     [randy.li@synaptics.com <mailto:randy.li@synaptics.com>]
>      > -=-=-=-=-=-=-=-=-=-=-=-
>      >
> 
>     -- 
>     Hsia-Jun(Randy) Li
> 

-- 
Hsia-Jun(Randy) Li

Re: [OE-core] [PATCH 03/26] meson: configure and use generic exe_wrapper

[Matt Madison]

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

On Fri, Dec 3, 2021 at 11:13 PM Alexander Kanavin <alex.kanavin@gmail.com>
wrote:

> This replaces the specific gtkdoc wrapper setting
> (which was rejected by upstream in
> https://github.com/mesonbuild/meson/pull/9627)
> with a generic, officially supported and documented exe_wrapper,
> which is enabled subject to qemu usermode support
> (just as is done for g-i and gtk-doc with autotools).
>
> gtk-doc support is adjusted so that this wrapper is passed to
> meson's gtk-doc module, which passes it to gtk-doc.
>
> The adjusted patch is re-submitted upstream.
>
> The side effect of this is that meson is now able to run
> target binaries in a generic way when it wants to, so this
> may affect cross-builds - hopefully in a positive way.
>

Inheriting the qemu class unconditionally causes task hash changes for
allarch recipes
that use meson (e.g. cantarell-fonts) when MACHINE is changed from, say, an
x86 architecture
to an aarch64 architecture, due to the qemu bbclass referencing the
OLDEST_KERNEL
variable.

I'm not sure of the best way to fix this; doing an overwrite of
OLDEST_KERNEL in
allarch.bbclass as is done for some other variables might be OK? I'm not
sure it
makes sense for allarch recipes to reference any QEMU stuff at all, so
maybe splitting
all of the exe_wrapper support into a separate bbclass that is only
inherited when
EXEWRAPPER_ENABLED is True is better?

Thanks,
-Matt


>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/classes/meson.bbclass                    | 30 +++++++++++++++++--
>  ...sues-that-arise-when-cross-compiling.patch | 27 +++++++++++------
>  2 files changed, 46 insertions(+), 11 deletions(-)
>
> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
> index a7981e481f..ffec5f3269 100644
> --- a/meta/classes/meson.bbclass
> +++ b/meta/classes/meson.bbclass
> @@ -1,7 +1,12 @@
> -inherit python3native meson-routines
> +inherit python3native meson-routines qemu
>
>  DEPENDS:append = " meson-native ninja-native"
>
> +EXEWRAPPER_ENABLED:class-native = "False"
> +EXEWRAPPER_ENABLED:class-nativesdk = "False"
> +EXEWRAPPER_ENABLED ?= "${@bb.utils.contains('MACHINE_FEATURES',
> 'qemu-usermode', 'True', 'False', d)}"
> +DEPENDS:append = "${@' qemu-native' if d.getVar('EXEWRAPPER_ENABLED') ==
> 'True' else ''}"
> +
>  # As Meson enforces out-of-tree builds we can just use cleandirs
>  B = "${WORKDIR}/build"
>  do_configure[cleandirs] = "${B}"
> @@ -36,6 +41,9 @@ MESON_CROSS_FILE = ""
>  MESON_CROSS_FILE:class-target = "--cross-file ${WORKDIR}/meson.cross"
>  MESON_CROSS_FILE:class-nativesdk = "--cross-file ${WORKDIR}/meson.cross"
>
> +# Needed to set up qemu wrapper below
> +export STAGING_DIR_HOST
> +
>  def rust_tool(d, target_var):
>      rustc = d.getVar('RUSTC')
>      if not rustc:
> @@ -62,6 +70,7 @@ cups-config = 'cups-config'
>  g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
>  g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper'
>  ${@rust_tool(d, "HOST_SYS")}
> +${@"exe_wrapper = '${WORKDIR}/meson-qemuwrapper'" if
> d.getVar('EXEWRAPPER_ENABLED') == 'True' else ""}
>
>  [built-in options]
>  c_args = ${@meson_array('CFLAGS', d)}
> @@ -71,7 +80,6 @@ cpp_link_args = ${@meson_array('LDFLAGS', d)}
>
>  [properties]
>  needs_exe_wrapper = true
> -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper'
>
>  [host_machine]
>  system = '${@meson_operating_system('HOST_OS', d)}'
> @@ -106,6 +114,24 @@ cpp_link_args = ${@meson_array('BUILD_LDFLAGS', d)}
>  EOF
>  }
>
> +do_write_config:append:class-target() {
> +    # Write out a qemu wrapper that will be used as exe_wrapper so that
> meson
> +    # can run target helper binaries through that.
> +    qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST',
> ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}"
> +    cat > ${WORKDIR}/meson-qemuwrapper << EOF
> +#!/bin/sh
> +# Use a modules directory which doesn't exist so we don't load random
> things
> +# which may then get deleted (or their dependencies) and potentially
> segfault
> +export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy
> +
> +# meson sets this wrongly (only to libs in build-dir),
> qemu-wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly
> +unset LD_LIBRARY_PATH
> +
> +$qemu_binary "\$@"
> +EOF
> +    chmod +x ${WORKDIR}/meson-qemuwrapper
> +}
> +
>  # Tell externalsrc that changes to this file require a reconfigure
>  CONFIGURE_FILES = "meson.build"
>
> diff --git
> a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> index ab4d5969d9..b098c4a123 100644
> ---
> a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> +++
> b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> @@ -1,29 +1,38 @@
> -From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00 2001
> +From bbdd6679e49bcba5ec022b240ac234a87b451e41 Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex.kanavin@gmail.com>
>  Date: Fri, 4 Aug 2017 16:16:41 +0300
> -Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
> +Subject: [PATCH] gtkdoc: add support for a binary wrapper
>
>  Make it possible to specify a wrapper for executing binaries
> +in cross-compiling scenarios.
>  (usually, some kind of target hardware emulator, such as qemu)
>
>  Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/9627
> ]
>  Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>
>  ---
> - mesonbuild/modules/gnome.py | 4 ++++
> - 1 file changed, 4 insertions(+)
> + mesonbuild/modules/gnome.py | 5 ++++-
> + 1 file changed, 4 insertions(+), 1 deletion(-)
>
>  diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
> -index dc2979e..c9ff9bd 100644
> +index 1c6952d..5a6ff94 100644
>  --- a/mesonbuild/modules/gnome.py
>  +++ b/mesonbuild/modules/gnome.py
> -@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
> +@@ -35,7 +35,7 @@ from ..mesonlib import (
> + from ..dependencies import Dependency, PkgConfigDependency,
> InternalDependency
> + from ..interpreterbase import noPosargs, noKwargs, permittedKwargs,
> FeatureNew, FeatureNewKwargs, FeatureDeprecatedKwargs, FeatureDeprecated
> + from ..interpreterbase import typed_kwargs, KwargInfo, ContainerTypeInfo
> +-from ..programs import ExternalProgram, OverrideProgram
> ++from ..programs import ExternalProgram, OverrideProgram,
> EmptyExternalProgram
> + from ..build import CustomTarget, CustomTargetIndex, GeneratedList
> +
> + if T.TYPE_CHECKING:
> +@@ -1103,6 +1103,9 @@ class GnomeModule(ExtensionModule):
>               args.append(f'--{program_name}={path}')
>           if namespace:
>               args.append('--namespace=' + namespace)
> -+        gtkdoc_exe_wrapper =
> state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
> -+        if gtkdoc_exe_wrapper is not None:
> -+            args.append('--run=' + gtkdoc_exe_wrapper)
> ++        if state.environment.need_exe_wrapper() and not
> isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
> ++            args.append('--run=' + '
> '.join(state.environment.get_exe_wrapper().get_command()))
>  +
>           args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
>           args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
> --
> 2.20.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159150):
> https://lists.openembedded.org/g/openembedded-core/message/159150
> Mute This Topic: https://lists.openembedded.org/mt/87494764/3618418
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
> [matt@madison.systems]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

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

Re: [OE-core] [PATCH 03/26] meson: configure and use generic exe_wrapper

[Alexander Kanavin]

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

On Wed, 15 Dec 2021 at 15:07, Matt Madison <matt@madison.systems> wrote:

> Inheriting the qemu class unconditionally causes task hash changes for
> allarch recipes
> that use meson (e.g. cantarell-fonts) when MACHINE is changed from, say,
> an x86 architecture
> to an aarch64 architecture, due to the qemu bbclass referencing the
> OLDEST_KERNEL
> variable.
>
> I'm not sure of the best way to fix this; doing an overwrite of
> OLDEST_KERNEL in
> allarch.bbclass as is done for some other variables might be OK? I'm not
> sure it
> makes sense for allarch recipes to reference any QEMU stuff at all, so
> maybe splitting
> all of the exe_wrapper support into a separate bbclass that is only
> inherited when
> EXEWRAPPER_ENABLED is True is better?
>

To be honest, I have no idea why passing '-r OLDEST_KERNEL' is there to
begin with. It's very old code which I didn't write, so maybe you can
submit a patch that removes it and I'll give it a spin?

Alex

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

Re: [OE-core] [PATCH 03/26] meson: configure and use generic exe_wrapper

[Khem Raj]

On 12/15/21 6:52 AM, Alexander Kanavin wrote:
> On Wed, 15 Dec 2021 at 15:07, Matt Madison <matt@madison.systems> wrote:
> 
>     Inheriting the qemu class unconditionally causes task hash changes
>     for allarch recipes
>     that use meson (e.g. cantarell-fonts) when MACHINE is changed from,
>     say, an x86 architecture
>     to an aarch64 architecture, due to the qemu bbclass referencing the
>     OLDEST_KERNEL
>     variable.
> 
>     I'm not sure of the best way to fix this; doing an overwrite of
>     OLDEST_KERNEL in
>     allarch.bbclass as is done for some other variables might be OK? I'm
>     not sure it
>     makes sense for allarch recipes to reference any QEMU stuff at all,
>     so maybe splitting
>     all of the exe_wrapper support into a separate bbclass that is only
>     inherited when
>     EXEWRAPPER_ENABLED is True is better?
> 
> 
> To be honest, I have no idea why passing '-r OLDEST_KERNEL' is there to 
> begin with. It's very old code which I didn't write, so maybe you can 
> submit a patch that removes it and I'll give it a spin?

This option helps detach host kernel version from what target kernel is, 
many architectures requires newer kernels as minimum kernels due to them 
being new and stable ABIs for them being completed in newer releases. So 
if one built aarch64 on really old distro which has kernel < 3.8 then 
aarch64 binaries will fail to run in qemu user mode complaining about 
too old kernel.

having said that, since then qemu now defines arhitecture specific 
UNAME_MINIMUM_RELEASE and calibrates  UNAME to UNAME_MINIMUM_RELEASE if 
QEMU_UNAME is older which means we do not need to set it explicitly 
usiing -r option anymore.

I did however found a bug in qemu where this value was not set properly 
for riscv32 which I have sent a fix upstream.

Lets try dropping -r option, I think it should work. Good test would be
building qemuarm64 on a build host running < 3.8 kernel and see if all 
builds ok. or qemuriscv64 on hosts with kernel < 4.15



> 
> Alex
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159726): https://lists.openembedded.org/g/openembedded-core/message/159726
> Mute This Topic: https://lists.openembedded.org/mt/87494764/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

Re: [OE-core] [PATCH 03/26] meson: configure and use generic exe_wrapper

[Alexander Kanavin]

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

On Wed, 15 Dec 2021 at 18:40, Khem Raj <raj.khem@gmail.com> wrote:

>
> Lets try dropping -r option, I think it should work. Good test would be
> building qemuarm64 on a build host running < 3.8 kernel and see if all
> builds ok. or qemuriscv64 on hosts with kernel < 4.15
>

I don't think such hosts are tested or supported, and they're going to
break in various other ways anyway.

Alex

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

Re: [OE-core] [PATCH 03/26] meson: configure and use generic exe_wrapper

[Khem Raj]

On 12/15/21 9:43 AM, Alexander Kanavin wrote:
> On Wed, 15 Dec 2021 at 18:40, Khem Raj <raj.khem@gmail.com 
> <mailto:raj.khem@gmail.com>> wrote:
> 
> 
>     Lets try dropping -r option, I think it should work. Good test would be
>     building qemuarm64 on a build host running < 3.8 kernel and see if all
>     builds ok. or qemuriscv64 on hosts with kernel < 4.15
> 
> 
> I don't think such hosts are tested or supported, and they're going to 
> break in various other ways anyway.
> 

Picking from set that yocto project supports

https://docs.yoctoproject.org/ref-manual/system-requirements.html?highlight=system%20requirement#supported-linux-distributions

( centos8 uses 4.18, centos7 uses 3.10, and debian8 uses 3.16 )

> Alex

Re: [OE-core] [PATCH 03/26] meson: configure and use generic exe_wrapper

[Alexander Kanavin]

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

On Wed, 15 Dec 2021 at 18:56, Khem Raj <raj.khem@gmail.com> wrote:

Picking from set that yocto project supports
>
>
> https://docs.yoctoproject.org/ref-manual/system-requirements.html?highlight=system%20requirement#supported-linux-distributions
>
> ( centos8 uses 4.18, centos7 uses 3.10, and debian8 uses 3.16 )
>

debian 8 has been retired from the AB, so it's just centos 7 - I wonder why
we still need to support it as a host for master; are there actual YP
members explicitly asking for it?

Alex

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

[PATCH 04/26] perlcross: do not copy ${S}/patches into sysroot

[Alexander Kanavin]

That is not actually a part of the source tree, and will
clash with perl's own ${S}/patches.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb b/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb
index 2759ef8a53..b8e1f846d7 100644
--- a/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb
+++ b/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb
@@ -34,6 +34,7 @@ do_compile () {
 do_install:class-native() {
     mkdir -p ${D}/${datadir}/perl-cross/
     cp -rf ${S}/* ${D}/${datadir}/perl-cross/
+    rm -rf ${D}/${datadir}/perl-cross/patches/
 }
 
 BBCLASSEXTEND = "native"
-- 
2.20.1

[PATCH 05/26] python3: drop unneeded multiprocessing module patch

[Alexander Kanavin]

I ran the reproducing sequence on qemux86, and it went fine:

root@qemux86:~# python3
Python 3.10.0 (default, Oct  4 2021, 17:55:55) [GCC 11.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import multiprocessing
>>> pool_sema = multiprocessing.BoundedSemaphore(value=1)
>>> pool_sema.acquire()
True
>>> pool_sema.release()
>>>

Additionally AB testing revealed no issues, and the description isn't entirely
clear about where and how the problem occurs, so I can't submit it upsream
without having that understanding and how to demonstrate the problem.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ssing-libraries-to-Extension-for-mul.patch | 70 -------------------
 .../recipes-devtools/python/python3_3.10.0.bb |  1 -
 2 files changed, 71 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch

diff --git a/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch b/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
deleted file mode 100644
index 374433c68e..0000000000
--- a/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From bad7e6a625436402a01d03021fb9ccd58bc9930f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 9 Jan 2020 17:44:05 +0100
-Subject: [PATCH] setup.py: pass missing libraries to Extension for
- multiprocessing module
-
-In the following commit:
-...
-commit e711cafab13efc9c1fe6c5cd75826401445eb585
-Author: Benjamin Peterson <benjamin@python.org>
-Date:   Wed Jun 11 16:44:04 2008 +0000
-
-    Merged revisions 64104,64117 via svnmerge from
-    svn+ssh://pythondev@svn.python.org/python/trunk
-...
-(see diff in setup.py)
-It assigned libraries for multiprocessing module according
-the host_platform, but not pass it to Extension.
-
-In glibc, the following commit caused two definition of
-sem_getvalue are different.
-https://sourceware.org/git/?p=glibc.git;a=commit;h=042e1521c794a945edc43b5bfa7e69ad70420524
-(see diff in nptl/sem_getvalue.c for detail)
-`__new_sem_getvalue' is the latest sem_getvalue@@GLIBC_2.1
-and `__old_sem_getvalue' is to compat the old version
-sem_getvalue@GLIBC_2.0.
-
-To build python for embedded Linux systems:
-http://www.yoctoproject.org/docs/2.3.1/yocto-project-qs/yocto-project-qs.html
-If not explicitly link to library pthread (-lpthread), it will
-load glibc's sem_getvalue randomly at runtime.
-
-Such as build python on linux x86_64 host and run the python
-on linux x86_32 target. If not link library pthread, it caused
-multiprocessing bounded semaphore could not work correctly.
-...
->>> import multiprocessing
->>> pool_sema = multiprocessing.BoundedSemaphore(value=1)
->>> pool_sema.acquire()
-True
->>> pool_sema.release()
-Traceback (most recent call last):
-  File "<stdin>", line 1, in <module>
-ValueError: semaphore or lock released too many times
-...
-
-And the semaphore issue also caused multiprocessing.Queue().put() hung.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index d92face..f42bcbb 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1836,7 +1836,7 @@ class PyBuildExt(build_ext):
-             if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
-                 sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
-                 multiprocessing_srcs.append('_multiprocessing/semaphore.c')
--        self.add(Extension('_multiprocessing', multiprocessing_srcs,
-+        self.add(Extension('_multiprocessing', multiprocessing_srcs, libraries=['pthread'],
-                            include_dirs=["Modules/_multiprocessing"]))
- 
-         if (not MS_WINDOWS and
diff --git a/meta/recipes-devtools/python/python3_3.10.0.bb b/meta/recipes-devtools/python/python3_3.10.0.bb
index e3300b6495..24e6c04fe9 100644
--- a/meta/recipes-devtools/python/python3_3.10.0.bb
+++ b/meta/recipes-devtools/python/python3_3.10.0.bb
@@ -25,7 +25,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-Use-FLAG_REF-always-for-interned-strings.patch \
            file://0001-test_locale.py-correct-the-test-output-format.patch \
            file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \
-           file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
            file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \
            file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
            file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \
-- 
2.20.1

Re: [OE-core] [PATCH 05/26] python3: drop unneeded multiprocessing module patch

[Richard Purdie]

On Sat, 2021-12-04 at 08:13 +0100, Alexander Kanavin wrote:
> I ran the reproducing sequence on qemux86, and it went fine:
> 
> root@qemux86:~# python3
> Python 3.10.0 (default, Oct  4 2021, 17:55:55) [GCC 11.2.0] on linux
> Type "help", "copyright", "credits" or "license" for more information.
> > > > import multiprocessing
> > > > pool_sema = multiprocessing.BoundedSemaphore(value=1)
> > > > pool_sema.acquire()
> True
> > > > pool_sema.release()
> > > > 
> 
> Additionally AB testing revealed no issues, and the description isn't entirely
> clear about where and how the problem occurs, so I can't submit it upsream
> without having that understanding and how to demonstrate the problem.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> 

There is a slightly different explanation here. libpthread was merged into libc
so this fix becomes a null-op on glibc. Not sure if musl has a separate pthread
but if so we could/should test that?

Cheers,

Richard

Re: [OE-core] [PATCH 05/26] python3: drop unneeded multiprocessing module patch

[Khem Raj]

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

On Mon, Dec 6, 2021 at 3:07 AM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Sat, 2021-12-04 at 08:13 +0100, Alexander Kanavin wrote:
> > I ran the reproducing sequence on qemux86, and it went fine:
> >
> > root@qemux86:~# python3
> > Python 3.10.0 (default, Oct  4 2021, 17:55:55) [GCC 11.2.0] on linux
> > Type "help", "copyright", "credits" or "license" for more information.
> > > > > import multiprocessing
> > > > > pool_sema = multiprocessing.BoundedSemaphore(value=1)
> > > > > pool_sema.acquire()
> > True
> > > > > pool_sema.release()
> > > > >
> >
> > Additionally AB testing revealed no issues, and the description isn't
> entirely
> > clear about where and how the problem occurs, so I can't submit it
> upsream
> > without having that understanding and how to demonstrate the problem.
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> >
>
> There is a slightly different explanation here. libpthread was merged into
> libc
> so this fix becomes a null-op on glibc. Not sure if musl has a separate
> pthread
> but if so we could/should test that?


Musl has always been a single shared object from day one infact glibc is
now moving in that direction so it will work fine on musl

>
>
> Cheers,
>
> Richard
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159219):
> https://lists.openembedded.org/g/openembedded-core/message/159219
> Mute This Topic: https://lists.openembedded.org/mt/87494766/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

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

Re: [OE-core] [PATCH 05/26] python3: drop unneeded multiprocessing module patch

[Alexander Kanavin]

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

On Mon, 6 Dec 2021 at 17:13, Khem Raj <raj.khem@gmail.com> wrote:

> There is a slightly different explanation here. libpthread was merged into
> libc
>
>> so this fix becomes a null-op on glibc. Not sure if musl has a separate
>> pthread
>> but if so we could/should test that?
>
>
> Musl has always been a single shared object from day one infact glibc is
> now moving in that direction so it will work fine on musl
>

Yep, I just verified this on qemux86 and qemux86-64.

Alex

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

[PATCH 06/26] python3: mark patch as inappropriate, with better explanation

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...0001-Makefile-do-not-compile-.pyc-in-parallel.patch | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch b/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
index b1bceac512..ea1efa9cac 100644
--- a/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
+++ b/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
@@ -3,13 +3,19 @@ From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 16 Jan 2020 12:34:20 +0100
 Subject: [PATCH] Makefile: do not compile .pyc in parallel
 
-This was found to break reproducibility, and produce strange file ownership
+This was found to lock up builds, break reproducibility, and produce strange file ownership
 races.
 
 The upstream commit introducing the change was:
 https://github.com/python/cpython/commit/1a2dd82f56bd813aacc570e172cefe55a8a41504
 
-Upstream-Status: Pending
+The build lock up issue is reported here:
+https://bugs.python.org/issue45945
+
+The repro failures are documented here:
+https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20211130-yr_o1a8d/packages/diff-html/
+
+Upstream-Status: Inappropriate [see issues above]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  Makefile.pre.in | 12 ++++++------
-- 
2.20.1

[PATCH 07/26] vala: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch b/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch
index ecab0fc1c9..2aaf2ab94e 100644
--- a/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch
+++ b/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] vapigen.m4: use $PKG_CONFIG_SYSROOT_DIR
 This is necessary in cross-compiling environments, where directories
 returned by pkg-config should be prefixed with sysroot location.
 
-Upstream-Status: Pending [review in oe-core list]
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/vala/-/merge_requests/218]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  vapigen/vapigen.m4 | 8 ++++----
-- 
2.20.1

[PATCH 08/26] valgrind: remove unneeded patch

[Alexander Kanavin]

Whatever the issues were all those years ago,
current valgrind builds ok on qemux86_64 and qemuppc.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...t-fail-to-build-on-some-PPC32-config.patch | 51 -------------------
 .../valgrind/valgrind_3.18.1.bb               |  1 -
 2 files changed, 52 deletions(-)
 delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch

diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch
deleted file mode 100644
index a78e1953ff..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9762fd23e1f1db66d4b977c694a17d3bca3fe99a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 8 Jan 2016 16:36:29 +0200
-Subject: [PATCH] Remove tests that fail to build on some PPC32 configurations
-
-Failures are documented here:
-http://errors.yoctoproject.org/Errors/Search/?items=10&query=862d702fbb99e484631315aa44b9e46f8fc567da&filter=valgrind&type=recipe
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-Upstream-Status: Pending
----
- memcheck/tests/ppc32/Makefile.am | 2 +-
- none/tests/ppc32/Makefile.am     | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am
-index 26b95a2..8f05743 100644
---- a/memcheck/tests/ppc32/Makefile.am
-+++ b/memcheck/tests/ppc32/Makefile.am
-@@ -10,7 +10,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
- 	power_ISA2_07.stderr.exp power_ISA2_07.vgtest
- 
- check_PROGRAMS = \
--	power_ISA2_05 power_ISA2_07
-+	power_ISA2_07
- 
- power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \
- 		-I$(top_srcdir)/include @FLAG_M32@
-diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am
-index 196239e..0fe3425 100644
---- a/none/tests/ppc32/Makefile.am
-+++ b/none/tests/ppc32/Makefile.am
-@@ -50,13 +50,13 @@ EXTRA_DIST = \
- 
- check_PROGRAMS = \
- 	allexec \
--	lsw jm-insns round \
-+	lsw \
- 	test_isa_2_06_part1 test_isa_2_06_part2 test_isa_2_06_part3 \
- 	test_dfp1 test_dfp2 test_dfp3 test_dfp4 test_dfp5 \
- 	test_isa_2_07_part1 test_isa_2_07_part2 \
- 	test_tm test_touch_tm ldst_multiple data-cache-instructions \
- 	test_fx test_gx \
--	testVMX twi tw xlc_dbl_u32 power5+_round power6_bcmp \
-+	twi tw xlc_dbl_u32 power6_bcmp \
- 	bug129390-ppc32 bug139050-ppc32 \
- 	ldstrev mftocrf mcrfs
- 
--- 
-2.6.4
-
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.18.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.18.1.bb
index 6fc2f36868..e825f83d5c 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.18.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.18.1.bb
@@ -21,7 +21,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
            file://taskset_nondeterministic_tests \
            file://0004-Fix-out-of-tree-builds.patch \
            file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \
-           file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \
            file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \
            file://avoid-neon-for-targets-which-don-t-support-it.patch \
            file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \
-- 
2.20.1

[PATCH 09/26] lighttpd: remove unneeded (since meson switch) patch

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...or-pcre-dependency-instead-of-config.patch | 42 -------------------
 .../lighttpd/lighttpd_1.4.61.bb               |  1 -
 2 files changed, 43 deletions(-)
 delete mode 100644 meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch

diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
deleted file mode 100644
index f17bdce2c0..0000000000
--- a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 26 Aug 2016 18:20:32 +0300
-Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
-
-RP 2014/5/22
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- configure.ac | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5383cec..c29a902 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre],
- )
- AC_MSG_RESULT([$WITH_PCRE])
- 
--if test "$WITH_PCRE" != no; then
--  if test "$WITH_PCRE" != yes; then
--    PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
--    CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
-+if test "$WITH_PCRE" != "no"; then
-+  PKG_CHECK_MODULES(PCREPKG, [libpcre], [
-+				PCRE_LIB=${PCREPKG_LIBS}
-+				CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
-+  ], [
-+				AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre])
-+  ])
-+
-+  if test x"$PCRE_LIB" != x; then
-+    AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
-+    AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
-+    AC_SUBST(PCRE_LIB)
-   else
-     AC_PATH_PROG([PCRECONFIG], [pcre-config])
-     if test -n "$PCRECONFIG"; then
--- 
-2.15.0
-
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb
index 32b0ae4ace..583b0e260c 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.61.bb
@@ -17,7 +17,6 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
            file://index.html.lighttpd \
            file://lighttpd.conf \
            file://lighttpd \
-           file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
            "
 
 SRC_URI[sha256sum] = "43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432"
-- 
2.20.1

[PATCH 10/26] stress-ng: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-Do-not-preserve-ownership-when-installing-example-jo.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
index 2ee0be54ba..107b83d20b 100644
--- a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
+++ b/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 30 Jul 2019 18:38:03 +0200
 Subject: [PATCH] Do not preserve ownership when installing example jobs
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/162]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 ---
-- 
2.20.1

[PATCH 11/26] zstd: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Makefile-sort-all-wildcard-file-list-expansions.patch  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch b/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
index 37c5ff0cc0..3d23648f5b 100644
--- a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
+++ b/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Makefile: sort all wildcard file list expansions
 Otherwise the order is non-deterministic and breaks
 reproducible builds.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2895]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 ---
-- 
2.20.1

[PATCH 12/26] sudo: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-lib-util-mksigname.c-correctly-include-header-for-ou.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch b/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch
index e7875c96f7..f63ed553be 100644
--- a/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch
+++ b/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch
@@ -4,7 +4,7 @@ Date: Fri, 24 Sep 2021 13:36:24 +0200
 Subject: [PATCH] lib/util/mksigname.c: correctly include header for out of
  tree builds
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/sudo-project/sudo/pull/123]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 ---
  lib/util/mksigname.c | 2 +-
-- 
2.20.1

[PATCH 13/26] adwaita-icon-theme: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Run-installation-commands-as-shell-jobs.patch          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
index 54e3e5ee85..a1d39cf558 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Run installation commands as shell jobs
 
 This greatly speeds up installation time on multi-core systems.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 ---
-- 
2.20.1

[PATCH 14/26] igt-gpu-tools: correct patch status

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-lib-meson.build-fix-meson-0.60-compatibility.patch     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch
index 159425a643..e7c782055b 100644
--- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch
+++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex@linutronix.de>
 Date: Mon, 25 Oct 2021 18:18:15 +0200
 Subject: [PATCH] lib/meson.build: fix meson 0.60 compatibility
 
-Upstream-Status: Pending
+Upstream-Status: Backport [https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/963917a3565466832a3b2fc22e9285d34a0bf944]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 ---
  lib/meson.build | 2 +-
-- 
2.20.1

[PATCH 15/26] wayland: drop unnecessary patch

[Alexander Kanavin]

wayland now picks the correct setting from the native .pc file.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-the-native-wayland-scanner-directly.patch | 28 -------------------
 .../wayland/wayland_1.19.0.bb                 |  1 -
 2 files changed, 29 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch

diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
deleted file mode 100644
index 11dc069147..0000000000
--- a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 98e7902a4ddcd80b61cce6f35f97907e841a5eda Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Sun, 16 Feb 2020 16:29:53 +0100
-Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH
-
-Otherwise, meson attempts to use the target pkg-config and fails.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- src/meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index d91c503..15730a3 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -59,8 +59,7 @@ if get_option('scanner')
- endif
- 
- if meson.is_cross_build() or not get_option('scanner')
--	scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
--	wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
-+	wayland_scanner_for_build = find_program('wayland-scanner')
- else
- 	wayland_scanner_for_build = wayland_scanner
- endif
diff --git a/meta/recipes-graphics/wayland/wayland_1.19.0.bb b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
index 5f8b972f76..4c9ae0f75c 100644
--- a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
@@ -14,7 +14,6 @@ DEPENDS = "expat libffi wayland-native"
 
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://run-ptest \
-           file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \
            file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \
            file://0001-build-Fix-strndup-detection-on-MinGW.patch \
            "
-- 
2.20.1

[PATCH 16/26] xserver-xorg: remove unneeded patch

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...e_display.c-add-missing-mi.h-include.patch | 23 -------------------
 .../xorg-xserver/xserver-xorg_21.1.1.bb       |  1 -
 2 files changed, 24 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch
deleted file mode 100644
index 4b8e43f1e4..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 7 Feb 2020 20:36:45 +0100
-Subject: [PATCH] drmmode_display.c: add missing mi.h include
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- hw/xfree86/drivers/modesetting/drmmode_display.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
-index e18cc37..3445cce 100644
---- a/hw/xfree86/drivers/modesetting/drmmode_display.c
-+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
-@@ -46,6 +46,7 @@
- #include "xf86Crtc.h"
- #include "drmmode_display.h"
- #include "present.h"
-+#include "mi.h"
- 
- #include <cursorstr.h>
- 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
index 5793e078ee..196d1edff5 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
@@ -1,7 +1,6 @@
 require xserver-xorg.inc
 
 SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
-           file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
            file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
            "
 SRC_URI[sha256sum] = "782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755"
-- 
2.20.1

[PATCH 17/26] kexec-tools: drop unneeded patch

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...xec-un-break-the-build-on-32-bit-x86.patch | 43 -------------------
 .../kexec/kexec-tools_2.0.23.bb               |  1 -
 2 files changed, 44 deletions(-)
 delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch

diff --git a/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch b/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch
deleted file mode 100644
index 36b0845f4a..0000000000
--- a/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From bb6a26371d15473b380459ac4404bf330634b585 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 20 Dec 2019 17:21:08 +0100
-Subject: [PATCH] kexec: un-break the build on 32 bit x86
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- kexec/arch/i386/Makefile    | 1 +
- kexec/arch/i386/kexec-x86.h | 4 ++++
- 2 files changed, 5 insertions(+)
-
-diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
-index f486103..5d560be 100644
---- a/kexec/arch/i386/Makefile
-+++ b/kexec/arch/i386/Makefile
-@@ -12,6 +12,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
- i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
- i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
-+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
- 
- dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS)			\
- 	kexec/arch/i386/crashdump-x86.h					\
-diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
-index 0f941df..c423171 100644
---- a/kexec/arch/i386/kexec-x86.h
-+++ b/kexec/arch/i386/kexec-x86.h
-@@ -56,9 +56,13 @@ struct arch_options_t {
- };
- 
- int multiboot_x86_probe(const char *buf, off_t len);
-+int multiboot2_x86_probe(const char *buf, off_t len);
- int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
- 	struct kexec_info *info);
-+int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
-+	struct kexec_info *info);
- void multiboot_x86_usage(void);
-+void multiboot2_x86_usage(void);
- 
- int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
- 			struct kexec_info *info);
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb
index 22a9498a7b..066de99fad 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb
@@ -17,7 +17,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
            file://0002-purgatory-Pass-r-directly-to-linker.patch \
            file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
            file://0005-Disable-PIE-during-link.patch \
-           file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \
            file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
            "
 
-- 
2.20.1

[PATCH 18/26] piglit: submit patches upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Add-a-missing-include-for-htobe32-definition.patch     | 2 +-
 ...0001-framework-profile.py-make-test-lists-reproducible.patch | 2 +-
 ...1-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch | 2 +-
 .../piglit/0001-serializer.py-make-.gz-files-reproducible.patch | 2 +-
 ...1-tests-shader.py-sort-the-file-list-before-working-on.patch | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/piglit/piglit/0001-Add-a-missing-include-for-htobe32-definition.patch b/meta/recipes-graphics/piglit/piglit/0001-Add-a-missing-include-for-htobe32-definition.patch
index caa48e088d..7b0cb17925 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-Add-a-missing-include-for-htobe32-definition.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-Add-a-missing-include-for-htobe32-definition.patch
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Sun, 1 Nov 2020 20:08:49 +0000
 Subject: [PATCH] Add a missing include for htobe32 definition
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/609]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  tests/spec/nv_copy_depth_to_color/nv_copy_depth_to_color.c | 2 ++
diff --git a/meta/recipes-graphics/piglit/piglit/0001-framework-profile.py-make-test-lists-reproducible.patch b/meta/recipes-graphics/piglit/piglit/0001-framework-profile.py-make-test-lists-reproducible.patch
index cc9482c047..c90f601cfa 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-framework-profile.py-make-test-lists-reproducible.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-framework-profile.py-make-test-lists-reproducible.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] framework/profile.py: make test lists reproducible
 These are created with os.walk, which yields different
 order depending on where it's run.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  framework/profile.py | 6 +++++-
diff --git a/meta/recipes-graphics/piglit/piglit/0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch b/meta/recipes-graphics/piglit/piglit/0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch
index 8704f98500..cb675e8d99 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch
@@ -6,7 +6,7 @@ Subject: [PATCH 1/2] generated_tests/gen_tcs/tes_input_tests.py: do not
 
 This helps reproducibility.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  generated_tests/gen_tcs_input_tests.py | 2 +-
diff --git a/meta/recipes-graphics/piglit/piglit/0001-serializer.py-make-.gz-files-reproducible.patch b/meta/recipes-graphics/piglit/piglit/0001-serializer.py-make-.gz-files-reproducible.patch
index 2efba6f866..a1db2987ac 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-serializer.py-make-.gz-files-reproducible.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-serializer.py-make-.gz-files-reproducible.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] serializer.py: make .gz files reproducible
 .gz format contains mtime of the compressed data, and
 SOURCE_DATE_EPOCH is the standard way to make it reproducuble.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  tests/serializer.py | 5 ++++-
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-shader.py-sort-the-file-list-before-working-on.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-shader.py-sort-the-file-list-before-working-on.patch
index 8321be8490..dee876bcbe 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-shader.py-sort-the-file-list-before-working-on.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-tests-shader.py-sort-the-file-list-before-working-on.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] tests/shader.py: sort the file list before working on it
 
 This allows later xml output to be reproducible.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  tests/shader.py | 4 +++-
-- 
2.20.1

[PATCH 19/26] lttng: submit patches upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../lttng-tools/0001-src-common-correct-header-location.patch   | 2 +-
 .../0001-lttng-ust-common-link-with-liburcu-explicitly.patch    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-src-common-correct-header-location.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-src-common-correct-header-location.patch
index 925b51c3ce..24fcce41cb 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-src-common-correct-header-location.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-src-common-correct-header-location.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] src/common: correct header location
 sys/unistd.h is not guaranteed to exist, and does not with
 e.g. musl C library.
 
-Upstream-Status: Pending
+Upstream-Status: Backport [http://git.lttng.org/?p=lttng-tools.git;a=commitdiff;h=8f14767d33f786d895e50633fb46b880249b6c54]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 ---
  src/common/kernel-probe.c    | 2 +-
diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch
index 2d61dfa525..d3c451fd2b 100644
--- a/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch
+++ b/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] lttng-ust-common: link with liburcu explicitly
 
 Otherwise linking errors are seen on x86-32.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [by email to lttng-dev, Francis, Jonathan]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 ---
  src/lib/lttng-ust-common/Makefile.am | 1 +
-- 
2.20.1

[PATCH 20/26] libid3tag: move to meta-oe

[Alexander Kanavin]

There are no consumers in oe-core; years ago it used to be gstreamer.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../0001-Fix-gperf-3.1-incompatibility.patch  | 40 -----------------
 .../libid3tag/libid3tag/10_utf16.patch        | 34 ---------------
 .../libid3tag/libid3tag/addpkgconfig.patch    | 43 -------------------
 .../libid3tag/libid3tag/cflags_filter.patch   | 19 --------
 .../libid3tag/obsolete_automake_macros.patch  | 15 -------
 .../libid3tag/unknown-encoding.patch          | 39 -----------------
 .../libid3tag/libid3tag_0.15.1b.bb            | 28 ------------
 8 files changed, 219 deletions(-)
 delete mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
 delete mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
 delete mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
 delete mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
 delete mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
 delete mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch
 delete mode 100644 meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 97ba2ce79c..7d3ca5c429 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -344,7 +344,6 @@ RECIPE_MAINTAINER:pn-libgudev = "Ross Burton <ross.burton@arm.com>"
 RECIPE_MAINTAINER:pn-libhandy = "Alexander Kanavin <alex.kanavin@gmail.com>"
 RECIPE_MAINTAINER:pn-libical = "Ross Burton <ross.burton@arm.com>"
 RECIPE_MAINTAINER:pn-libice = "Unassigned <unassigned@yoctoproject.org>"
-RECIPE_MAINTAINER:pn-libid3tag = "Unassigned <unassigned@yoctoproject.org>"
 RECIPE_MAINTAINER:pn-libidn2 = "Ross Burton <ross.burton@arm.com>"
 RECIPE_MAINTAINER:pn-libinput = "Ross Burton <ross.burton@arm.com>"
 RECIPE_MAINTAINER:pn-libjitterentropy = "Ross Burton <ross.burton@arm.com>"
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch b/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
deleted file mode 100644
index 54f49f6f23..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 91fcf66b9182c75cd2b96d88991d5a1c6307d4b4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 2 Aug 2017 16:27:52 +0300
-Subject: [PATCH] Fix gperf 3.1 incompatibility.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- compat.h    | 2 +-
- frametype.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/compat.h b/compat.h
-index 8af71ec..b3d80d9 100644
---- a/compat.h
-+++ b/compat.h
-@@ -34,7 +34,7 @@ struct id3_compat {
- };
- 
- struct id3_compat const *id3_compat_lookup(register char const *,
--					   register unsigned int);
-+					   register size_t);
- 
- int id3_compat_fixup(struct id3_tag *);
- 
-diff --git a/frametype.h b/frametype.h
-index dd064b2..b5b7593 100644
---- a/frametype.h
-+++ b/frametype.h
-@@ -37,6 +37,6 @@ extern struct id3_frametype const id3_frametype_unknown;
- extern struct id3_frametype const id3_frametype_obsolete;
- 
- struct id3_frametype const *id3_frametype_lookup(register char const *,
--						 register unsigned int);
-+						 register size_t);
- 
- # endif
--- 
-2.13.2
-
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch b/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
deleted file mode 100644
index 10e089018c..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-libid3tag: patch for CVE-2004-2779
-
-The patch comes from
-https://sources.debian.org/patches/libid3tag/0.15.1b-13/10_utf16.dpatch
-
-Upstream-Status: Pending
-
-CVE: CVE-2004-2779
-CVE: CVE-2017-11551
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
-diff -urNad libid3tag-0.15.1b/utf16.c /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c
---- libid3tag-0.15.1b/utf16.c	2006-01-13 15:26:29.000000000 +0100
-+++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c	2006-01-13 15:27:19.000000000 +0100
-@@ -282,5 +282,18 @@
- 
-   free(utf16);
- 
-+  if (end == *ptr && length % 2 != 0)
-+  {
-+     /* We were called with a bogus length.  It should always
-+      * be an even number.  We can deal with this in a few ways:
-+      * - Always give an error.
-+      * - Try and parse as much as we can and
-+      *   - return an error if we're called again when we
-+      *     already tried to parse everything we can.
-+      *   - tell that we parsed it, which is what we do here.
-+      */
-+     (*ptr)++;
-+  }
-+
-   return ucs4;
- }
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch b/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
deleted file mode 100644
index 38d40c3632..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libid3tag-0.15.1b/Makefile.am
-===================================================================
---- libid3tag-0.15.1b.orig/Makefile.am	2009-07-29 09:29:20.000000000 +0100
-+++ libid3tag-0.15.1b/Makefile.am	2009-07-29 09:29:47.000000000 +0100
-@@ -27,6 +27,9 @@
- lib_LTLIBRARIES =	libid3tag.la
- include_HEADERS =	id3tag.h
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = id3tag.pc
-+
- ## From the libtool documentation on library versioning:
- ##
- ## CURRENT
-Index: libid3tag-0.15.1b/configure.ac
-===================================================================
---- libid3tag-0.15.1b.orig/configure.ac	2009-07-29 09:27:15.000000000 +0100
-+++ libid3tag-0.15.1b/configure.ac	2009-07-29 09:27:45.000000000 +0100
-@@ -201,5 +201,5 @@
- dnl AC_SUBST(LTLIBOBJS)
- 
- AC_CONFIG_FILES([Makefile msvc++/Makefile  \
--	libid3tag.list])
-+	libid3tag.list id3tag.pc])
- AC_OUTPUT
-Index: libid3tag-0.15.1b/id3tag.pc.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libid3tag-0.15.1b/id3tag.pc.in	2009-07-29 09:29:10.000000000 +0100
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: id3tag
-+Description: ID3 tag reading library
-+Requires:
-+Version: @VERSION@
-+Libs: -L${libdir} -lid3tag -lz
-+Cflags: -I${includedir}
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch b/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
deleted file mode 100644
index 1895748d1d..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-configure contains CFLAGS filtering code which was removing our prefix-map
-flags. We need those to generate reproducible binaries. Allow them through.
-
-Upstream-Status: Pending
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -99,6 +99,10 @@ do
- 	-mno-cygwin)
- 	    shift
- 	    ;;
-+	-fmacro-prefix-map*|-fdebug-prefix-map*|-ffile-prefix-map*)
-+	    CFLAGS="$CFLAGS $1"
-+	    shift
-+	    ;;
- 	-m*)
- 	    arch="$arch $1"
- 	    shift
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch b/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
deleted file mode 100644
index 2845fb1d3a..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3599280&group_id=12349&atid=112349]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd libid3tag-0.15.1b/configure.ac libid3tag-0.15.1b/configure.ac
---- libid3tag-0.15.1b/configure.ac	2004-01-24 01:22:46.000000000 +0200
-+++ libid3tag-0.15.1b/configure.ac	2013-01-03 06:41:02.734835014 +0200
-@@ -28,7 +28,7 @@
-
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
-
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
-
- dnl System type.
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch b/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch
deleted file mode 100644
index f0867b5f01..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-In case of an unknown/invalid encoding, id3_parse_string() will
-return NULL, but the return value wasn't checked resulting
-in segfault in id3_ucs4_length().  This is the only place
-the return value wasn't checked.
-
-Patch taken from Debian:
-https://sources.debian.org/patches/libid3tag/0.15.1b-14/11_unknown_encoding.dpatch/
-
-CVE: CVE-2017-11550
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf
---- libid3tag-0.15.1b~/compat.gperf	2004-01-23 09:41:32.000000000 +0000
-+++ libid3tag-0.15.1b/compat.gperf	2007-01-14 14:36:53.000000000 +0000
-@@ -236,6 +236,10 @@
- 
-     encoding = id3_parse_uint(&data, 1);
-     string   = id3_parse_string(&data, end - data, encoding, 0);
-+    if (!string)
-+    {
-+	continue;
-+    }
- 
-     if (id3_ucs4_length(string) < 4) {
-       free(string);
-diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c
---- libid3tag-0.15.1b~/parse.c	2004-01-23 09:41:32.000000000 +0000
-+++ libid3tag-0.15.1b/parse.c	2007-01-14 14:37:34.000000000 +0000
-@@ -165,6 +165,9 @@
-   case ID3_FIELD_TEXTENCODING_UTF_8:
-     ucs4 = id3_utf8_deserialize(ptr, length);
-     break;
-+  default:
-+  	/* FIXME: Unknown encoding! Print warning? */
-+	return NULL;
-   }
- 
-   if (ucs4 && !full) {
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
deleted file mode 100644
index 80581765ac..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Library for interacting with ID3 tags in MP3 files"
-HOMEPAGE = "http://sourceforge.net/projects/mad/"
-BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-			file://COPYRIGHT;md5=5e6279efb87c26c6e5e7a68317a6a87a \
-			file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63"
-SECTION = "libs"
-DEPENDS = "zlib gperf-native"
-PR = "r7"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \
-           file://addpkgconfig.patch \
-           file://obsolete_automake_macros.patch \
-           file://0001-Fix-gperf-3.1-incompatibility.patch \
-           file://10_utf16.patch \
-           file://unknown-encoding.patch \
-           file://cflags_filter.patch \
-           "
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/"
-UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P<pver>.*)/$"
-
-SRC_URI[md5sum] = "e5808ad997ba32c498803822078748c3"
-SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
-
-S = "${WORKDIR}/libid3tag-${PV}"
-
-inherit autotools pkgconfig
-- 
2.20.1

[PATCH 21/26] systemtap: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../systemtap/0001-staprun-address-ncurses-6.3-failures.patch   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch
index b53e107d84..1decf21593 100644
--- a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex@linutronix.de>
 Date: Mon, 25 Oct 2021 17:59:24 +0200
 Subject: [PATCH] staprun: address ncurses 6.3 failures
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [by email to smakarov@redhat.com,systemtap@sourceware.org]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 ---
  staprun/monitor.c | 24 ++++++++++++------------
-- 
2.20.1

[PATCH 22/26] ffmpeg: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-libavutil-include-assembly-with-full-path-from-sourc.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch
index 3b503c49c9..2b4ca0e9b9 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavutil-include-assembly-with-full-path-from-sourc.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] libavutil: include assembly with full path from source root
 Otherwise nasm writes the full host-specific paths into .o
 output, which breaks binary reproducibility.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [by email to jamrial@gmail.com,ffmpeg-devel@ffmpeg.org]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  libavutil/x86/cpuid.asm      | 2 +-
-- 
2.20.1

[PATCH 23/26] libfm: submit patches upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-Correctly-check-the-stamp-file-that-indicates-if-we-.patch | 2 +-
 ...01-Do-not-add-library-path-to-avoid-host-contamination.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch b/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch
index fb91d90cf2..701b259cf9 100644
--- a/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch
+++ b/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch
@@ -4,7 +4,7 @@ Date: Fri, 16 Dec 2016 16:52:04 +0200
 Subject: [PATCH] Correctly check the stamp file that indicates if we need to
  re-build vala code
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/lxde/libfm/pull/85]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  configure.ac | 2 +-
diff --git a/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch b/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch
index f4c89127fc..0437000adc 100644
--- a/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch
+++ b/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 2 May 2018 16:48:47 +0300
 Subject: [PATCH] Do not add library path to avoid host contamination
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/lxde/libfm/pull/86]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  src/modules/Makefile.am | 1 -
-- 
2.20.1

[PATCH 24/26] libgcrypt: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch b/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch
index 8fbed9add6..62b7484e45 100644
--- a/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch
+++ b/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 24 Feb 2021 19:43:07 +0000
 Subject: [PATCH] Makefile.am: add a missing space
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [by email to gniibe@fsij.org,gcrypt-devel@gnupg.org]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  cipher/Makefile.am | 2 +-
-- 
2.20.1

[PATCH 25/26] libgpg-error: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch
index 0f6e309391..ef7a7df1b8 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] configure.ac: do not hardcode gnu libc when generating
 
 This erroneously excluded e.g. musl libc.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [by email to gniibe@fsij.org,gnupg-devel@gnupg.org]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  configure.ac | 2 +-
-- 
2.20.1

[PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Alexander Kanavin]

With this commit I am entering the patch nirvana (and I intend to stay there):

~/development/poky$ grep -ilr "upstream-status: pending" `grep -ilr kanavin meta*`|wc -l
0

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch    | 2 +-
 ...op.creating.directories.without.sandbox-install.prefix.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
index e6172ef5aa..73e8a8386b 100644
--- a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
+++ b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC
 Upstream removed it in
 https://github.com/openssl/openssl/pull/16004
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [last release in 2015, last commit in 2019]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 ---
  buckets/ssl_buckets.c | 3 +--
diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
index 91640d6044..ba1b01c740 100644
--- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
+++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
@@ -31,7 +31,7 @@ ERROR: scons install execution failed.
   and the installed paths (including the paths inside libserf*.pc)
   look correct
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [last release in 2015, last commit in 2019]
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 
-- 
2.20.1

RE: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> Sent: den 4 december 2021 08:13
> To: openembedded-core@lists.openembedded.org
> Cc: Alexander Kanavin <alex@linutronix.de>
> Subject: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for
> upstream submission
> 
> With this commit I am entering the patch nirvana (and I intend to stay
> there):
> 
> ~/development/poky$ grep -ilr "upstream-status: pending" `grep -ilr kanavin meta*`|wc -l
> 0

Even though we appreciate your work, I think the two paragraphs above 
belong after the --- below, as they don't have anything to do with the 
actual change in this commit.

//Peter

> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch    | 2 +-
>  ...op.creating.directories.without.sandbox-install.prefix.patch | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-
> not-use-ERR_GET_FUNC.patch b/meta/recipes-support/serf/serf/0001-buckets-
> ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
> index e6172ef5aa..73e8a8386b 100644
> --- a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-
> use-ERR_GET_FUNC.patch
> +++ b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-
> use-ERR_GET_FUNC.patch
> @@ -6,7 +6,7 @@ Subject: [PATCH] buckets/ssl_buckets.c: do not use
> ERR_GET_FUNC
>  Upstream removed it in
>  https://github.com/openssl/openssl/pull/16004
> 
> -Upstream-Status: Pending
> +Upstream-Status: Inappropriate [last release in 2015, last commit in
> 2019]
>  Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>  ---
>   buckets/ssl_buckets.c | 3 +--
> diff --git a/meta/recipes-
> support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-
> install.prefix.patch b/meta/recipes-
> support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-
> install.prefix.patch
> index 91640d6044..ba1b01c740 100644
> --- a/meta/recipes-
> support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-
> install.prefix.patch
> +++ b/meta/recipes-
> support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-
> install.prefix.patch
> @@ -31,7 +31,7 @@ ERROR: scons install execution failed.
>    and the installed paths (including the paths inside libserf*.pc)
>    look correct
> 
> -Upstream-Status: Pending
> +Upstream-Status: Inappropriate [last release in 2015, last commit in
> 2019]
> 
>  Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> 
> --
> 2.20.1

Re: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Ross Burton]

On Sat, 4 Dec 2021 at 07:13, Alexander Kanavin <alex.kanavin@gmail.com> wrote:
> -Upstream-Status: Pending
> +Upstream-Status: Inappropriate [last release in 2015, last commit in 2019]

If someone picked up Serf maintainership tomorrow, would these patches
be suitable upstream?  If so, then they're not Inappropriate.

Ross

Re: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Alexander Kanavin]

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

On Mon, 6 Dec 2021 at 11:25, Ross Burton <ross@burtonini.com> wrote:

> On Sat, 4 Dec 2021 at 07:13, Alexander Kanavin <alex.kanavin@gmail.com>
> wrote:
> > -Upstream-Status: Pending
> > +Upstream-Status: Inappropriate [last release in 2015, last commit in
> 2019]
>
> If someone picked up Serf maintainership tomorrow, would these patches
> be suitable upstream?  If so, then they're not Inappropriate.
>

Presumably, that someone would start updating the repo and making releases,
at which point we can reevaluate the situation with the patches. As of
today, they are inappropriate.

Alex

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

Re: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Ross Burton]

On Mon, 6 Dec 2021 at 11:03, Alexander Kanavin <alex.kanavin@gmail.com> wrote:
> Presumably, that someone would start updating the repo and making releases, at which point we can reevaluate the situation with the patches. As of today, they are inappropriate.

But how, in two years time, would we know to re-evaluate the patches
if they're marked as inappropriate for upstream?

They're not inappropriate for upstream, we just can't submit them to a
meaningful upstream.  There's a big difference.

Ross

Re: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Alexander Kanavin]

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

On Mon, 6 Dec 2021 at 15:08, Ross Burton <ross@burtonini.com> wrote:

> On Mon, 6 Dec 2021 at 11:03, Alexander Kanavin <alex.kanavin@gmail.com>
> wrote:
> > Presumably, that someone would start updating the repo and making
> releases, at which point we can reevaluate the situation with the patches.
> As of today, they are inappropriate.
>
> But how, in two years time, would we know to re-evaluate the patches
> if they're marked as inappropriate for upstream?
>

We should properly, clearly document the reason why they're inappropriate
for upstream right now, just above the upstream-status line which is a
summary. If there is a new release in the future, at that point any upgrade
activity should re-evaluate all existing patches for the old version
anyway, even if they're inappropriate, or submitted or anything else - too
much time would have passed by then.

Alex

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

Re: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Alexander Kanavin]

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

I mean, if you insisit, we can add Upstream-Status: Defunct, but I do not
think keeping patches in Pending state when there is no upstream is right
either.

Alex

On Mon, 6 Dec 2021 at 16:45, Alexander Kanavin via lists.openembedded.org
<alex.kanavin=gmail.com@lists.openembedded.org> wrote:

> On Mon, 6 Dec 2021 at 15:08, Ross Burton <ross@burtonini.com> wrote:
>
>> On Mon, 6 Dec 2021 at 11:03, Alexander Kanavin <alex.kanavin@gmail.com>
>> wrote:
>> > Presumably, that someone would start updating the repo and making
>> releases, at which point we can reevaluate the situation with the patches.
>> As of today, they are inappropriate.
>>
>> But how, in two years time, would we know to re-evaluate the patches
>> if they're marked as inappropriate for upstream?
>>
>
> We should properly, clearly document the reason why they're inappropriate
> for upstream right now, just above the upstream-status line which is a
> summary. If there is a new release in the future, at that point any upgrade
> activity should re-evaluate all existing patches for the old version
> anyway, even if they're inappropriate, or submitted or anything else - too
> much time would have passed by then.
>
> Alex
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159249):
> https://lists.openembedded.org/g/openembedded-core/message/159249
> Mute This Topic: https://lists.openembedded.org/mt/87494788/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

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

Re: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Richard Purdie]

On Mon, 2021-12-06 at 16:50 +0100, Alexander Kanavin wrote:
> I mean, if you insisit, we can add Upstream-Status: Defunct, but I do not
> think keeping patches in Pending state when there is no upstream is right
> either.

Maybe we should add an Upstream-Inactive status?

Cheers,

Richard

Re: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Konrad Weihmann]

To quote the documentation:

   Inappropriate [reason]
   - The patch is not appropriate for upstream, include a brief reason 
on the
     same line enclosed with []
     reason can be:
	...
       no upstream (the upstream is no longer available -- dead project)

so I think this is already covered, but I think we need to enforce the 
usage of machine readable reasoning within the square brackets.

And if we need a more fine grained classification here, I would suggest 
to add a new item at Inappropriate

On 06.12.21 17:41, Richard Purdie wrote:
> On Mon, 2021-12-06 at 16:50 +0100, Alexander Kanavin wrote:
>> I mean, if you insisit, we can add Upstream-Status: Defunct, but I do not
>> think keeping patches in Pending state when there is no upstream is right
>> either.
> 
> Maybe we should add an Upstream-Inactive status?
> 
> Cheers,
> 
> Richard
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159256): https://lists.openembedded.org/g/openembedded-core/message/159256
> Mute This Topic: https://lists.openembedded.org/mt/87494788/3647476
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [kweihmann@outlook.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

Re: [OE-core] [PATCH 26/26] serf: mark patches as inappropriate for upstream submission

[Alexander Kanavin]

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

Thanks - since there's already documented nomenclature for this situation,
I tweaked the patch to simply use that.

Alex

On Mon, 6 Dec 2021 at 17:47, Konrad Weihmann <kweihmann@outlook.com> wrote:

> To quote the documentation:
>
>    Inappropriate [reason]
>    - The patch is not appropriate for upstream, include a brief reason
> on the
>      same line enclosed with []
>      reason can be:
>         ...
>        no upstream (the upstream is no longer available -- dead project)
>
> so I think this is already covered, but I think we need to enforce the
> usage of machine readable reasoning within the square brackets.
>
> And if we need a more fine grained classification here, I would suggest
> to add a new item at Inappropriate
>
> On 06.12.21 17:41, Richard Purdie wrote:
> > On Mon, 2021-12-06 at 16:50 +0100, Alexander Kanavin wrote:
> >> I mean, if you insisit, we can add Upstream-Status: Defunct, but I do
> not
> >> think keeping patches in Pending state when there is no upstream is
> right
> >> either.
> >
> > Maybe we should add an Upstream-Inactive status?
> >
> > Cheers,
> >
> > Richard
> >
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#159256):
> https://lists.openembedded.org/g/openembedded-core/message/159256
> > Mute This Topic: https://lists.openembedded.org/mt/87494788/3647476
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> kweihmann@outlook.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>

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