[PATCH 01/36] ovmf: submit patch upstream

[PATCH 01/36] ovmf: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch b/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch
index e467d6f152..9e345f4dda 100644
--- a/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch
+++ b/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch
@@ -14,7 +14,7 @@ overflowing section sizes and causing small changes in the binary output.
 Previously we relied on the stripped output being the same which isn't always
 the case if the size of the debug symbols varies.
 
-Upstream-Status: Pending [gcc parts may be upstreamable, nasm patch isn't upstream yet]
+Upstream-Status: Submitted [https://github.com/tianocore/edk2/pull/2202]
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
-- 
2.20.1

[PATCH 02/36] groff: mark patch as non-upstreamable

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/groff/files/0001-Include-config.h.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/groff/files/0001-Include-config.h.patch b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
index 46065bc513..34fca1eb2f 100644
--- a/meta/recipes-extended/groff/files/0001-Include-config.h.patch
+++ b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
@@ -20,7 +20,7 @@ In file included from TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4-
 We delete eqn.cpp and qen.hpp in do_configure
 to ensure they're regenerated and deterministic.
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [issue fixed upstream with a similar patch]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  src/libs/libgroff/assert.cpp  |   4 +
-- 
2.20.1

Re: [OE-core] [PATCH 02/36] groff: mark patch as non-upstreamable

[Richard Purdie]

On Wed, 2021-11-17 at 16:34 +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/recipes-extended/groff/files/0001-Include-config.h.patch | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-extended/groff/files/0001-Include-config.h.patch b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
> index 46065bc513..34fca1eb2f 100644
> --- a/meta/recipes-extended/groff/files/0001-Include-config.h.patch
> +++ b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
> @@ -20,7 +20,7 @@ In file included from TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4-
>  We delete eqn.cpp and qen.hpp in do_configure
>  to ensure they're regenerated and deterministic.
>  
> -Upstream-Status: Pending
> +Upstream-Status: Inappropriate [issue fixed upstream with a similar patch]
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>  ---
>   src/libs/libgroff/assert.cpp  |   4 +


Should we replace this with the upstream patch? That way we'd have a clean
backport which would help at upgrade time? 

Is the upstream patch exactly functionally equivalent?

Sometimes it can be good to test the upstream version so we know come upgrade
time we're ok and we don't need to ask upstream to make any further tweaks.

Cheers,

Richard

Re: [OE-core] [PATCH 02/36] groff: mark patch as non-upstreamable

[Alexander Kanavin]

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

This is the upstream fix:
https://git.savannah.gnu.org/cgit/groff.git/commit/?id=979f3f4266151c7681a68a40d2c4913842a7271d

I can backport that, rebase the existing patch on top and see what's left,
sure.

Alex
On Fri, 19 Nov 2021 at 12:15, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Wed, 2021-11-17 at 16:34 +0100, Alexander Kanavin wrote:
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  meta/recipes-extended/groff/files/0001-Include-config.h.patch | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git
> a/meta/recipes-extended/groff/files/0001-Include-config.h.patch
> b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
> > index 46065bc513..34fca1eb2f 100644
> > --- a/meta/recipes-extended/groff/files/0001-Include-config.h.patch
> > +++ b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
> > @@ -20,7 +20,7 @@ In file included from
> TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4-
> >  We delete eqn.cpp and qen.hpp in do_configure
> >  to ensure they're regenerated and deterministic.
> >
> > -Upstream-Status: Pending
> > +Upstream-Status: Inappropriate [issue fixed upstream with a similar
> patch]
> >  Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >  ---
> >   src/libs/libgroff/assert.cpp  |   4 +
>
>
> Should we replace this with the upstream patch? That way we'd have a clean
> backport which would help at upgrade time?
>
> Is the upstream patch exactly functionally equivalent?
>
> Sometimes it can be good to test the upstream version so we know come
> upgrade
> time we're ok and we don't need to ask upstream to make any further tweaks.
>

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

Re: [OE-core] [PATCH 02/36] groff: mark patch as non-upstreamable

[Alexander Kanavin]

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

I checked; the patches are the same, except the upstream one misses one
file, which is fixed in a different upstream patch. I'd say we can keep
things as they are.

Alex

On Fri, 19 Nov 2021 at 12:34, Alexander Kanavin via lists.openembedded.org
<alex.kanavin=gmail.com@lists.openembedded.org> wrote:

> This is the upstream fix:
>
> https://git.savannah.gnu.org/cgit/groff.git/commit/?id=979f3f4266151c7681a68a40d2c4913842a7271d
>
> I can backport that, rebase the existing patch on top and see what's left,
> sure.
>
> Alex
> On Fri, 19 Nov 2021 at 12:15, Richard Purdie <
> richard.purdie@linuxfoundation.org> wrote:
>
>> On Wed, 2021-11-17 at 16:34 +0100, Alexander Kanavin wrote:
>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > ---
>> >  meta/recipes-extended/groff/files/0001-Include-config.h.patch | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git
>> a/meta/recipes-extended/groff/files/0001-Include-config.h.patch
>> b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
>> > index 46065bc513..34fca1eb2f 100644
>> > --- a/meta/recipes-extended/groff/files/0001-Include-config.h.patch
>> > +++ b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
>> > @@ -20,7 +20,7 @@ In file included from
>> TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4-
>> >  We delete eqn.cpp and qen.hpp in do_configure
>> >  to ensure they're regenerated and deterministic.
>> >
>> > -Upstream-Status: Pending
>> > +Upstream-Status: Inappropriate [issue fixed upstream with a similar
>> patch]
>> >  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> >  ---
>> >   src/libs/libgroff/assert.cpp  |   4 +
>>
>>
>> Should we replace this with the upstream patch? That way we'd have a clean
>> backport which would help at upgrade time?
>>
>> Is the upstream patch exactly functionally equivalent?
>>
>> Sometimes it can be good to test the upstream version so we know come
>> upgrade
>> time we're ok and we don't need to ask upstream to make any further
>> tweaks.
>>
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#158506):
> https://lists.openembedded.org/g/openembedded-core/message/158506
> Mute This Topic: https://lists.openembedded.org/mt/87121973/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: 4163 bytes --]

Re: [OE-core] [PATCH 02/36] groff: mark patch as non-upstreamable

[Richard Purdie]

On Fri, 2021-11-19 at 13:08 +0100, Alexander Kanavin wrote:
> I checked; the patches are the same, except the upstream one misses one file,
> which is fixed in a different upstream patch. I'd say we can keep things as
> they are.

Can we mark as a backport of those two commits then?

Cheers,

Richard

Re: [OE-core] [PATCH 02/36] groff: mark patch as non-upstreamable

[Alexander Kanavin]

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

On Fri, 19 Nov 2021 at 13:29, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Fri, 2021-11-19 at 13:08 +0100, Alexander Kanavin wrote:
> > I checked; the patches are the same, except the upstream one misses one
> file,
> > which is fixed in a different upstream patch. I'd say we can keep things
> as
> > they are.
>
> Can we mark as a backport of those two commits then?
>

Right, I will add the upstream references to the patch.

Alex

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

[PATCH 03/36] logrotate: add a link to upstream review for one of the patch

[Alexander Kanavin]

The patch author (Robert Yang) has been asked by email
to rework the patch.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../logrotate/logrotate/act-as-mv-when-rotate.patch             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
index 671fce4ac8..4efd471906 100644
--- a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
+++ b/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Act as the "mv" command when rotate log
 Act as the "mv" command when rotate log, first rename, if failed, then
 read and write.
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [needs a rework according to https://github.com/logrotate/logrotate/pull/429]
 
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 
-- 
2.20.1

[PATCH 04/36] weston: submit patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-weston-launch-Provide-a-default-version-that-doesn-t.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index 3279a728cc..548611d933 100644
--- a/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -11,7 +11,7 @@ Since starting weston as root is a valid use case by itself, if
 PAM is not available, provide a default version of weston-launch
 without non-root-user support.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/725]
 
 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-- 
2.20.1

[PATCH 05/36] db: mark all patches as non-upstreamable

[Alexander Kanavin]

Since Oracle relicensed bdb, the open source community
is slowly but surely replacing bdb with supported and
open source friendly alternatives.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch | 2 +-
 ...1-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch | 2 +-
 .../db/db/0001-clock-Do-not-define-own-timespec.patch           | 2 +-
 ...1-configure-Add-explicit-tag-options-to-libtool-invoca.patch | 2 +-
 meta/recipes-support/db/db/fix-parallel-build.patch             | 2 +-
 meta/recipes-support/db/db/sequence-type.patch                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch b/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch
index a4ff2ecb0c..c82e7c375f 100644
--- a/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch
+++ b/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch
@@ -7,7 +7,7 @@ db5 does not build because it is redefining a C++11 standard
 library identifier, atomic_init().  Therefore prefix all
 its internal defines with '__db_', to avoid collisions.
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [as far as open source community is concerned, upstream is dead]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
diff --git a/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch b/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
index 571708e03e..2374885e77 100644
--- a/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
+++ b/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
@@ -11,7 +11,7 @@ Fixes
 ../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin function '__atomic_compare_exchange'
 static inline int __atomic_compare_exchange(
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [as far as open source community is concerned, upstream is dead]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
diff --git a/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch
index 9d51a44a26..d238b0f063 100644
--- a/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch
+++ b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch
@@ -10,7 +10,7 @@ its 12-bytes here and libc has 16-bytes
 
 This can cause problems especially with 64bit time_t
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [as far as open source community is concerned, upstream is dead]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  src/dbinc/clock.h | 17 +----------------
diff --git a/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch b/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch
index cb28db1343..a574cf67b9 100644
--- a/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch
+++ b/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch
@@ -7,7 +7,7 @@ This helps cross compile when tag inference via heuristics
 fail because CC variable is having -fPIE -pie and libtool
 smartly removes it when building libraries
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [as far as open source community is concerned, upstream is dead]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
diff --git a/meta/recipes-support/db/db/fix-parallel-build.patch b/meta/recipes-support/db/db/fix-parallel-build.patch
index 27632e1ddb..42c2407cf2 100644
--- a/meta/recipes-support/db/db/fix-parallel-build.patch
+++ b/meta/recipes-support/db/db/fix-parallel-build.patch
@@ -2,7 +2,7 @@ With higher paralelism it sometimes fails with:
 libtool: link: `util_log.lo' is not a valid libtool object
 make: *** [db_replicate] Error 1
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [as far as open source community is concerned, upstream is dead]
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 
diff --git a/meta/recipes-support/db/db/sequence-type.patch b/meta/recipes-support/db/db/sequence-type.patch
index a6fe3d62a0..fc9f7f0113 100644
--- a/meta/recipes-support/db/db/sequence-type.patch
+++ b/meta/recipes-support/db/db/sequence-type.patch
@@ -6,7 +6,7 @@ in stdint.h.
 This then breaks the overly complicated type check but as we know that int64_t
 exists and works, we can just delete that.
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [as far as open source community is concerned, upstream is dead]
 Signed-off-by: Ross Burton <ross.burton@intel.com>
 
 --- a/dist/aclocal/sequence.m4~	2013-09-09 16:35:02.000000000 +0100
-- 
2.20.1

[PATCH 06/36] unzip/zip: mark all patches as non-upstreamable

[Alexander Kanavin]

While upstream is not technically dead as of today [1], it has not made
a release in over a decade, and there is no source code repo to
rebase the patches on. If/when a new release ever comes, or someone
takes over the maintenance, we can reassess the situation with these patches.

[1] Discussion in https://sourceforge.net/p/infozip/bugs/53/

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/unzip/unzip/avoid-strip.patch         | 2 +-
 meta/recipes-extended/unzip/unzip/define-ldflags.patch      | 2 +-
 meta/recipes-extended/unzip/unzip/fix-security-format.patch | 2 +-
 meta/recipes-extended/unzip/unzip/symlink.patch             | 2 +-
 meta/recipes-extended/zip/zip-3.0/fix-security-format.patch | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-extended/unzip/unzip/avoid-strip.patch b/meta/recipes-extended/unzip/unzip/avoid-strip.patch
index 8f30e42674..e0c89d81b7 100644
--- a/meta/recipes-extended/unzip/unzip/avoid-strip.patch
+++ b/meta/recipes-extended/unzip/unzip/avoid-strip.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [need a new release]
 
 unix/Makefile: remove hard coded strip commands
 
diff --git a/meta/recipes-extended/unzip/unzip/define-ldflags.patch b/meta/recipes-extended/unzip/unzip/define-ldflags.patch
index 659c6e3315..dc554c32cb 100644
--- a/meta/recipes-extended/unzip/unzip/define-ldflags.patch
+++ b/meta/recipes-extended/unzip/unzip/define-ldflags.patch
@@ -1,6 +1,6 @@
 Pass LDFLAGS to the linker 
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [need a new release]
 
 Signed-off-by: Mikhail Durnev <Mikhail_Durnev@mentor.com>
 
diff --git a/meta/recipes-extended/unzip/unzip/fix-security-format.patch b/meta/recipes-extended/unzip/unzip/fix-security-format.patch
index 8e9b06c423..ba6ead3b5e 100644
--- a/meta/recipes-extended/unzip/unzip/fix-security-format.patch
+++ b/meta/recipes-extended/unzip/unzip/fix-security-format.patch
@@ -5,7 +5,7 @@ Fix security formatting issues related to sprintf parameters expeted.
 [YOCTO #9551]
 [https://bugzilla.yoctoproject.org/show_bug.cgi?id=9551]
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [need a new release]
 
 Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
 
diff --git a/meta/recipes-extended/unzip/unzip/symlink.patch b/meta/recipes-extended/unzip/unzip/symlink.patch
index a38f6f1612..c1d82ac187 100644
--- a/meta/recipes-extended/unzip/unzip/symlink.patch
+++ b/meta/recipes-extended/unzip/unzip/symlink.patch
@@ -6,7 +6,7 @@ a symlink entry."
 
 This patch is taken from Fedora (https://bugzilla.redhat.com/show_bug.cgi?id=972427)
 
-Upstream-Status: Pending (upstream is dead)
+Upstream-Status: Inappropriate [need a new release]
 Signed-off-by: Ross Burton <ross.burton@intel.com>
 
 --- unzip60/process.c.sav	2013-06-09 12:08:57.070392264 +0200
diff --git a/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch b/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch
index 19d8548273..5cdbf22a54 100644
--- a/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch
+++ b/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch
@@ -14,7 +14,7 @@ zip.c:1228:5: error: format not a string literal and no format arguments [-Werro
 [YOCTO #9552]
 [https://bugzilla.yoctoproject.org/show_bug.cgi?id=9552]
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [need a new release]
 
 Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
 
-- 
2.20.1

[PATCH 07/36] automake: update 1.16.3 -> 1.16.5

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...date-for-python.m4-to-respect-libdir.patch | 83 +++++++++++++++++
 .../automake/automake/python-libdir.patch     | 88 -------------------
 ...{automake_1.16.3.bb => automake_1.16.5.bb} |  5 +-
 3 files changed, 86 insertions(+), 90 deletions(-)
 create mode 100644 meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch
 delete mode 100644 meta/recipes-devtools/automake/automake/python-libdir.patch
 rename meta/recipes-devtools/automake/{automake_1.16.3.bb => automake_1.16.5.bb} (85%)

diff --git a/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch b/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch
new file mode 100644
index 0000000000..d28045618e
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch
@@ -0,0 +1,83 @@
+From dff74c5b19935cc11b30116a7ae9c8affdff246b Mon Sep 17 00:00:00 2001
+From: Kumar Gala <galak@kernel.crashing.org>
+Date: Thu, 11 Aug 2011 01:26:33 -0500
+Subject: [PATCH] automake: Update for python.m4 to respect libdir
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
+
+Updated for automake-1.12.6
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ m4/python.m4 | 24 ++++++------------------
+ 1 file changed, 6 insertions(+), 18 deletions(-)
+
+diff --git a/m4/python.m4 b/m4/python.m4
+index 4e7de9427..40fc5b396 100644
+--- a/m4/python.m4
++++ b/m4/python.m4
+@@ -96,6 +96,8 @@ AC_DEFUN([AM_PATH_PYTHON],
+     [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
+   AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+ 
++  AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}'])
++
+   dnl At times, e.g., when building shared libraries, you may want
+   dnl to know which OS platform Python thinks this is.
+   dnl
+@@ -251,14 +253,7 @@ except ImportError:
+    else
+      am_py_prefix=$am_cv_python_prefix
+    fi
+-   am_cv_python_pythondir=`$PYTHON -c "
+-$am_python_setup_sysconfig
+-if can_use_sysconfig:
+-  sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+-else:
+-  from distutils import sysconfig
+-  sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+-sys.stdout.write(sitedir)"`
++   am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
+    #
+    case $am_cv_python_pythondir in
+    $am_py_prefix*)
+@@ -268,7 +263,7 @@ sys.stdout.write(sitedir)"`
+    *)
+      case $am_py_prefix in
+        /usr|/System*) ;;
+-       *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
++       *) am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
+           ;;
+      esac
+      ;;
+@@ -293,14 +288,7 @@ sys.stdout.write(sitedir)"`
+    else
+      am_py_exec_prefix=$am_cv_python_exec_prefix
+    fi
+-   am_cv_python_pyexecdir=`$PYTHON -c "
+-$am_python_setup_sysconfig
+-if can_use_sysconfig:
+-  sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
+-else:
+-  from distutils import sysconfig
+-  sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
+-sys.stdout.write(sitedir)"`
++   am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
+    #
+    case $am_cv_python_pyexecdir in
+    $am_py_exec_prefix*)
+@@ -310,7 +298,7 @@ sys.stdout.write(sitedir)"`
+    *)
+      case $am_py_exec_prefix in
+        /usr|/System*) ;;
+-       *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
++       *) am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
+           ;;
+      esac
+      ;;
+-- 
+2.20.1
+
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
deleted file mode 100644
index f319fc001b..0000000000
--- a/meta/recipes-devtools/automake/automake/python-libdir.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 61bd143910001aaf610416d7ca56c52c0b081318 Mon Sep 17 00:00:00 2001
-From: Kumar Gala <galak@kernel.crashing.org>
-Date: Thu, 11 Aug 2011 01:26:33 -0500
-Subject: [PATCH] automake: Update for python.m4 to respect libdir
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-
-Updated for automake-1.12.6
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- m4/python.m4 | 27 +++++++--------------------
- 1 file changed, 7 insertions(+), 20 deletions(-)
-
-diff --git a/m4/python.m4 b/m4/python.m4
-index b2302ba..dbc6954 100644
---- a/m4/python.m4
-+++ b/m4/python.m4
-@@ -96,12 +96,13 @@ AC_DEFUN([AM_PATH_PYTHON],
-     [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])
-   AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
- 
--  dnl Use the values of $prefix and $exec_prefix for the corresponding
--  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
-+  dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding
-+  dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX.  These are made
-   dnl distinct variables so they can be overridden if need be.  However,
-   dnl general consensus is that you shouldn't need this ability.
- 
-   AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
-+  AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}'])
-   AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
- 
-   dnl At times (like when building shared libraries) you may want
-@@ -146,14 +147,7 @@ except ImportError:
-      else
-        am_py_prefix=$prefix
-      fi
--     am_cv_python_pythondir=`$PYTHON -c "
--$am_python_setup_sysconfig
--if can_use_sysconfig:
--    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
--else:
--    from distutils import sysconfig
--    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
--sys.stdout.write(sitedir)"`
-+     am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
-      case $am_cv_python_pythondir in
-      $am_py_prefix*)
-        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-@@ -163,7 +157,7 @@ sys.stdout.write(sitedir)"`
-        case $am_py_prefix in
-          /usr|/System*) ;;
-          *)
--	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
-+	  am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
- 	  ;;
-        esac
-        ;;
-@@ -188,14 +182,7 @@ sys.stdout.write(sitedir)"`
-      else
-        am_py_exec_prefix=$exec_prefix
-      fi
--     am_cv_python_pyexecdir=`$PYTHON -c "
--$am_python_setup_sysconfig
--if can_use_sysconfig:
--    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
--else:
--    from distutils import sysconfig
--    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
--sys.stdout.write(sitedir)"`
-+     am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
-      case $am_cv_python_pyexecdir in
-      $am_py_exec_prefix*)
-        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-@@ -205,7 +192,7 @@ sys.stdout.write(sitedir)"`
-        case $am_py_exec_prefix in
-          /usr|/System*) ;;
-          *)
--	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
-+	   am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
- 	   ;;
-        esac
-        ;;
diff --git a/meta/recipes-devtools/automake/automake_1.16.3.bb b/meta/recipes-devtools/automake/automake_1.16.5.bb
similarity index 85%
rename from meta/recipes-devtools/automake/automake_1.16.3.bb
rename to meta/recipes-devtools/automake/automake_1.16.5.bb
index 1882eedcda..6a9c185e4d 100644
--- a/meta/recipes-devtools/automake/automake_1.16.3.bb
+++ b/meta/recipes-devtools/automake/automake_1.16.5.bb
@@ -18,7 +18,8 @@ RDEPENDS:${PN} += "\
 
 RDEPENDS:${PN}:class-native = "autoconf-native hostperl-runtime-native"
 
-SRC_URI += "file://python-libdir.patch \
+SRC_URI += "\
+           file://0001-automake-Update-for-python.m4-to-respect-libdir.patch \
            file://buildtest.patch \
            file://performance.patch \
            file://new_rt_path_for_test-driver.patch \
@@ -26,7 +27,7 @@ SRC_URI += "file://python-libdir.patch \
            file://0001-build-fix-race-in-parallel-builds.patch \
            "
 
-SRC_URI[sha256sum] = "ce010788b51f64511a1e9bb2a1ec626037c6d0e7ede32c1c103611b9d3cba65f"
+SRC_URI[sha256sum] = "07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605"
 
 PERL = "${USRBINPATH}/perl"
 PERL:class-native = "${USRBINPATH}/env perl"
-- 
2.20.1

[PATCH 08/36] libunistring: address automake 1.16.5 failures

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...IT_PACKAGE-work-with-Automake-1.16.4.patch | 57 +++++++++++++++++++
 .../libunistring/libunistring_0.9.10.bb       |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch

diff --git a/meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch b/meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch
new file mode 100644
index 0000000000..d8424f28d4
--- /dev/null
+++ b/meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch
@@ -0,0 +1,57 @@
+From 15e4365267e316f15222b8bf9f0a7cd0db231e9c Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sun, 8 Aug 2021 01:58:42 +0200
+Subject: [PATCH] Make gl_INIT_PACKAGE work with Automake >= 1.16.4.
+
+Reported and analyzed by Nicole Mazzuca <mazzucan@outlook.com> in
+<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00002.html>.
+
+* m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro
+gl_INIT_EMPTY.
+(gl_INIT_DUMMY): Expand to empty in two steps, via a new macro
+gl_INIT_DUMMY2.
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ ChangeLog                  | 10 ++++++++++
+ m4/init-package-version.m4 | 12 ++++++++----
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/m4/init-package-version.m4 b/m4/init-package-version.m4
+index f131a84..a26b1ab 100644
+--- a/m4/init-package-version.m4
++++ b/m4/init-package-version.m4
+@@ -1,5 +1,5 @@
+-# init-package-version.m4 serial 1 (gettext-0.18)
+-dnl Copyright (C) 1992-2009 Free Software Foundation, Inc.
++# init-package-version.m4 serial 2
++dnl Copyright (C) 1992-2021 Free Software Foundation, Inc.
+ dnl This file is free software, distributed under the terms of the GNU
+ dnl General Public License.  As a special exception to the GNU General
+ dnl Public License, this file may be distributed as part of a program
+@@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE],
+             m4_bpatsubst(m4_dquote(
+                 m4_defn([AM_INIT_AUTOMAKE])),
+               [AC_PACKAGE_NAME], [gl_INIT_DUMMY])),
+-          [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])),
++          [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])),
+       [AC_PACKAGE_VERSION], [gl_INIT_DUMMY])
+     [AC_SUBST([PACKAGE], [$1])
+      AC_SUBST([VERSION], [$2])
+@@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE],
+   m4_define([AM_INIT_AUTOMAKE],
+     m4_defn([gl_RPL_INIT_AUTOMAKE]))
+ ])
+-m4_define([gl_INIT_DUMMY], [])
++m4_define([gl_INIT_EMPTY], [])
++dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY.
++dnl But a macro that later expands to empty works.
++m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2])
++m4_define([gl_INIT_DUMMY2], [])
+ AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
+   m4_ifval([$2],
+     [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])])
+-- 
+2.20.1
+
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.10.bb b/meta/recipes-support/libunistring/libunistring_0.9.10.bb
index 589faacb05..0692bbcb44 100644
--- a/meta/recipes-support/libunistring/libunistring_0.9.10.bb
+++ b/meta/recipes-support/libunistring/libunistring_0.9.10.bb
@@ -22,6 +22,7 @@ DEPENDS = "gperf-native"
 
 SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
+           file://0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch \
 "
 SRC_URI[md5sum] = "0d3274e9838396b12200f8b54ddaf43b"
 SRC_URI[sha256sum] = "a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b"
-- 
2.20.1

[PATCH 09/36] gettext: address automake 1.16.5 failures

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-builds-with-automake-1.16.4-and-new.patch | 29 +++++++++++++++++++
 meta/recipes-core/gettext/gettext_0.21.bb     |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch

diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch b/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch
new file mode 100644
index 0000000000..727d1db552
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch
@@ -0,0 +1,29 @@
+From 2f127ebe425c97b0641fe1bc73247e91e18c2be0 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Thu, 11 Nov 2021 22:06:16 +0100
+Subject: [PATCH] libtextstyle: fix builds with automake 1.16.4 and newer
+
+Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?59929]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ libtextstyle/configure.ac | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libtextstyle/configure.ac b/libtextstyle/configure.ac
+index 63b4c2a..cab9025 100644
+--- a/libtextstyle/configure.ac
++++ b/libtextstyle/configure.ac
+@@ -17,11 +17,10 @@ dnl along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ([2.63])
+-AC_INIT
++AC_INIT([libtextstyle],
++    [0.20.1])
+ AC_CONFIG_SRCDIR([version.sh])
+ AC_CONFIG_AUX_DIR([build-aux])
+-. $srcdir/version.sh
+-gl_INIT_PACKAGE([libtextstyle], [$VERSION_NUMBER])
+ AM_INIT_AUTOMAKE([1.13 silent-rules])
+ AM_CONFIG_HEADER([config.h])
+ 
diff --git a/meta/recipes-core/gettext/gettext_0.21.bb b/meta/recipes-core/gettext/gettext_0.21.bb
index 5ada709937..a0f3402904 100644
--- a/meta/recipes-core/gettext/gettext_0.21.bb
+++ b/meta/recipes-core/gettext/gettext_0.21.bb
@@ -22,6 +22,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \
            file://mingw.patch \
            file://0001-msgmerge-29-Add-executable-file-mode-bits.patch \
+           file://0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch \
            "
 SRC_URI[sha256sum] = "c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12"
 
-- 
2.20.1

[PATCH 10/36] ccache: upgrade 4.4.2 -> 4.5

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

License-Update: third party version references updated

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../ccache/{ccache_4.4.2.bb => ccache_4.5.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/ccache/{ccache_4.4.2.bb => ccache_4.5.bb} (82%)

diff --git a/meta/recipes-devtools/ccache/ccache_4.4.2.bb b/meta/recipes-devtools/ccache/ccache_4.5.bb
similarity index 82%
rename from meta/recipes-devtools/ccache/ccache_4.4.2.bb
rename to meta/recipes-devtools/ccache/ccache_4.5.bb
index dd0ad642b2..a98bb43ead 100644
--- a/meta/recipes-devtools/ccache/ccache_4.4.2.bb
+++ b/meta/recipes-devtools/ccache/ccache_4.5.bb
@@ -7,12 +7,12 @@ HOMEPAGE = "http://ccache.samba.org"
 SECTION = "devel"
 
 LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=985be6d06a50f60a9893a19a6d2550b8"
+LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=8fe0fdfdc7a892516526b86c28d06a16"
 
 DEPENDS = "zstd"
 
 SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "357a2ac55497b39ad6885c14b00cda6cf21d1851c6290f4288e62972665de417"
+SRC_URI[sha256sum] = "8f1c6495a06ae0a9ff311c9d43096233702a2045c476ca1ae393b434abf1f528"
 
 UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/"
 
-- 
2.20.1

[PATCH 11/36] python3-hypothesis: upgrade 6.24.2 -> 6.24.3

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...ython3-hypothesis_6.24.2.bb => python3-hypothesis_6.24.3.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-hypothesis_6.24.2.bb => python3-hypothesis_6.24.3.bb} (91%)

diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.24.2.bb b/meta/recipes-devtools/python/python3-hypothesis_6.24.3.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.24.2.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.24.3.bb
index ef45ddb6c6..431a5e328a 100644
--- a/meta/recipes-devtools/python/python3-hypothesis_6.24.2.bb
+++ b/meta/recipes-devtools/python/python3-hypothesis_6.24.3.bb
@@ -13,7 +13,7 @@ SRC_URI += " \
     file://test_rle.py \
     "
 
-SRC_URI[sha256sum] = "4030f88ae0a8d3339a41dd7589c78d3ba0a3a270f729c12aceddaea7c60b224b"
+SRC_URI[sha256sum] = "fccfba3803f391eea2c8c6f21667886ca7407b135b6121e0701a7f8addc176f7"
 
 RDEPENDS:${PN} += " \
     python3-attrs \
-- 
2.20.1

[PATCH 12/36] python3-pyparsing: upgrade 3.0.5 -> 3.0.6

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../{python3-pyparsing_3.0.5.bb => python3-pyparsing_3.0.6.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pyparsing_3.0.5.bb => python3-pyparsing_3.0.6.bb} (85%)

diff --git a/meta/recipes-devtools/python/python3-pyparsing_3.0.5.bb b/meta/recipes-devtools/python/python3-pyparsing_3.0.6.bb
similarity index 85%
rename from meta/recipes-devtools/python/python3-pyparsing_3.0.5.bb
rename to meta/recipes-devtools/python/python3-pyparsing_3.0.6.bb
index 6f2c7f6cd9..d15ff33e9b 100644
--- a/meta/recipes-devtools/python/python3-pyparsing_3.0.5.bb
+++ b/meta/recipes-devtools/python/python3-pyparsing_3.0.6.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://pyparsing.wikispaces.com/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1"
 
-SRC_URI[sha256sum] = "9329d1c1b51f0f76371c4ded42c5ec4cc0be18456b22193e0570c2da98ed288b"
+SRC_URI[sha256sum] = "d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"
 
 UPSTREAM_CHECK_REGEX = "pyparsing-(?P<pver>.*)\.tar"
 
-- 
2.20.1

[PATCH 13/36] asciidoc: upgrade 10.0.1 -> 10.0.2

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

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

diff --git a/meta/recipes-extended/asciidoc/asciidoc_10.0.1.bb b/meta/recipes-extended/asciidoc/asciidoc_10.0.2.bb
similarity index 94%
rename from meta/recipes-extended/asciidoc/asciidoc_10.0.1.bb
rename to meta/recipes-extended/asciidoc/asciidoc_10.0.2.bb
index 40574df6e2..1b618175bc 100644
--- a/meta/recipes-extended/asciidoc/asciidoc_10.0.1.bb
+++ b/meta/recipes-extended/asciidoc/asciidoc_10.0.2.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \
                     file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 "
 
 SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main"
-SRCREV = "74823bed08e7b823d2b6cba8636a1fd67fed6cc9"
+SRCREV = "7bad9d2e77f7d384ac9042732adaefd4f6ed8979"
 
 DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
-- 
2.20.1

[PATCH 14/36] libpipeline: upgrade 1.5.3 -> 1.5.4

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

License-Update: http -> https

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../{libpipeline_1.5.3.bb => libpipeline_1.5.4.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/libpipeline/{libpipeline_1.5.3.bb => libpipeline_1.5.4.bb} (72%)

diff --git a/meta/recipes-extended/libpipeline/libpipeline_1.5.3.bb b/meta/recipes-extended/libpipeline/libpipeline_1.5.4.bb
similarity index 72%
rename from meta/recipes-extended/libpipeline/libpipeline_1.5.3.bb
rename to meta/recipes-extended/libpipeline/libpipeline_1.5.4.bb
index ee15fd0644..bfbfdc87f1 100644
--- a/meta/recipes-extended/libpipeline/libpipeline_1.5.3.bb
+++ b/meta/recipes-extended/libpipeline/libpipeline_1.5.4.bb
@@ -4,10 +4,10 @@ without needing to involve shell command-line parsing which is often \
 error-prone and insecure."
 HOMEPAGE = "http://libpipeline.nongnu.org/"
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz"
-SRC_URI[sha256sum] = "5dbf08faf50fad853754293e57fd4e6c69bb8e486f176596d682c67e02a0adb0"
+SRC_URI[sha256sum] = "db785bddba0a37ef14b4ef82ae2d18b8824e6983dfb9910319385e28df3f1a9c"
 
 inherit pkgconfig autotools
 
-- 
2.20.1

[PATCH 15/36] piglit: upgrade to latest revision

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 0a3de466c7..e9213e09a9 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "83bc56abf2686e2cd9024a152e121ca4aa524985"
+SRCREV = "0ef03f824d1833a853d1a20b4be121089bb9246c"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
-- 
2.20.1

[PATCH 16/36] diffoscope: upgrade 190 -> 192

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

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

diff --git a/meta/recipes-support/diffoscope/diffoscope_190.bb b/meta/recipes-support/diffoscope/diffoscope_192.bb
similarity index 92%
rename from meta/recipes-support/diffoscope/diffoscope_190.bb
rename to meta/recipes-support/diffoscope/diffoscope_192.bb
index 8303ee4693..4dda858ef2 100644
--- a/meta/recipes-support/diffoscope/diffoscope_190.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_192.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "29e3c5ce764b494771876aef3f587ed4867374a0f4e28afe39d4f0640ddb7744"
+SRC_URI[sha256sum] = "ae2774334fce7905f1b938a155d487d55b9fef9da9a9d18eda3d74951a8a8084"
 
 RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm"
 
-- 
2.20.1

[PATCH 17/36] systemd: upgrade 249.5 -> 249.6

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...md-boot_249.5.bb => systemd-boot_249.6.bb} |  0
 meta/recipes-core/systemd/systemd.inc         |  2 +-
 ...l_dependency-to-get-include-director.patch | 46 -------------------
 ...002-don-t-use-glibc-specific-qsort_r.patch |  2 +-
 ...dd-__compare_fn_t-and-comparison_fn_.patch |  2 +-
 ...k-parse_printf_format-implementation.patch |  4 +-
 ...missing.h-check-for-missing-strndupa.patch | 10 ++--
 .../0006-Include-netinet-if_ether.h.patch     |  6 +--
 ...OB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch |  2 +-
 ...008-add-missing-FTW_-macros-for-musl.patch |  3 +-
 ..._register_atfork-for-non-glibc-build.patch |  4 +-
 ...10-Use-uintmax_t-for-handling-rlim_t.patch |  6 +--
 ...sable-tests-for-missing-typedefs-in-.patch |  2 +-
 ...T_SYMLINK_NOFOLLOW-flag-to-faccessat.patch |  2 +-
 ...patible-basename-for-non-glibc-syste.patch |  2 +-
 ...uffering-when-writing-to-oom_score_a.patch |  4 +-
 ...compliant-strerror_r-from-GNU-specif.patch |  2 +-
 ...S_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch |  2 +-
 ...ype.h-add-__compar_d_fn_t-definition.patch |  2 +-
 ...definition-of-prctl_mm_map-structure.patch |  2 +-
 .../systemd/0019-Handle-missing-LOCK_EX.patch |  2 +-
 ...ible-pointer-type-struct-sockaddr_un.patch |  2 +-
 .../0021-test-json.c-define-M_PIl.patch       |  2 +-
 ...-not-disable-buffer-in-writing-files.patch |  2 +-
 .../0025-Handle-__cpu_mask-usage.patch        |  2 +-
 .../systemd/0026-Handle-missing-gshadow.patch |  2 +-
 ...l.h-Define-MIPS-ABI-defines-for-musl.patch |  2 +-
 .../{systemd_249.5.bb => systemd_249.6.bb}    |  1 -
 28 files changed, 37 insertions(+), 83 deletions(-)
 rename meta/recipes-core/systemd/{systemd-boot_249.5.bb => systemd-boot_249.6.bb} (100%)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-use-partial_dependency-to-get-include-director.patch
 rename meta/recipes-core/systemd/{systemd_249.5.bb => systemd_249.6.bb} (99%)

diff --git a/meta/recipes-core/systemd/systemd-boot_249.5.bb b/meta/recipes-core/systemd/systemd-boot_249.6.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot_249.5.bb
rename to meta/recipes-core/systemd/systemd-boot_249.6.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 4e4cdd2e2f..f3ce32efc2 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "00b0393e65252bf631670604f58b844780b08c50"
+SRCREV = "deda69dad784f9c4367533555ff4d7bf6308c0ff"
 SRCBRANCH = "v249-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
 "
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-use-partial_dependency-to-get-include-director.patch b/meta/recipes-core/systemd/systemd/0001-meson-use-partial_dependency-to-get-include-director.patch
deleted file mode 100644
index 51ee5d8623..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-meson-use-partial_dependency-to-get-include-director.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 260e871fda979f040c94d2011545e8122bed68ca Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Mon, 18 Oct 2021 10:13:07 +0200
-Subject: [PATCH] meson: use partial_dependency() to get include directory
-
-Getting the variable directly from pkg-config is prone to host
-contamination when building in sysroots as the
-compiler starts looking for the headers on the host in addition to
-the sysroot.
-
-Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/21027]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- meson.build | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index df53c6156d..38fb37dd75 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2618,18 +2618,17 @@ endif
- 
- if conf.get('ENABLE_LOCALED') == 1
-         if conf.get('HAVE_XKBCOMMON') == 1
--                # logind will load libxkbcommon.so dynamically on its own
--                deps = [libdl]
--                extra_includes = [libxkbcommon.get_pkgconfig_variable('includedir')]
-+                # logind will load libxkbcommon.so dynamically on its own, but we still
-+                # need to specify where the headers are
-+                deps = [libdl, libxkbcommon.partial_dependency(compile_args: true)]
-         else
-                 deps = []
--                extra_includes = []
-         endif
- 
-         executable(
-                 'systemd-localed',
-                 systemd_localed_sources,
--                include_directories : includes + extra_includes,
-+                include_directories : includes,
-                 link_with : [libshared],
-                 dependencies : deps,
-                 install_rpath : rootlibexecdir,
--- 
-2.20.1
-
diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
index f233ee6621..47ac24ab04 100644
--- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
+++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
@@ -1,4 +1,4 @@
-From 30bd749c6777701496124272b59e1283252c3267 Mon Sep 17 00:00:00 2001
+From 10e00305eef277310e9cbb219080b53ea6ea9c6f Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 13:41:41 +0800
 Subject: [PATCH] don't use glibc-specific qsort_r
diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
index a51ab0ab2e..26f05fd50a 100644
--- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
+++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
@@ -1,4 +1,4 @@
-From 4dba0a3b1372ce34d8b6e150a108123a1b2b0b96 Mon Sep 17 00:00:00 2001
+From 8a64ec1087c161be3985f16e7f37e1beed6623f6 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 13:55:12 +0800
 Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t
diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
index 3c07f6005f..51cfc355c0 100644
--- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
+++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
@@ -1,4 +1,4 @@
-From 842d231165f0d564c51d93650820e4fa7f097c3e Mon Sep 17 00:00:00 2001
+From b5e4f966f95ddb793316fe9d494a8a4c56247e23 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Sat, 22 May 2021 20:26:24 +0200
 Subject: [PATCH] add fallback parse_printf_format implementation
@@ -23,7 +23,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
  create mode 100644 src/basic/parse-printf-format.h
 
 diff --git a/meson.build b/meson.build
-index b5a51b6d0d..11cf56efee 100644
+index 5bdfd9753d..3421da3a4d 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -656,6 +656,7 @@ endif
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
index 1b9e194667..32b5090d8f 100644
--- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
+++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -1,4 +1,4 @@
-From 95c61768e1f8d76a7bd28355429fc4b7b428ad61 Mon Sep 17 00:00:00 2001
+From 0dfa2bcd34e10b354177a988c8be433de782f1c7 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 14:18:21 +0800
 Subject: [PATCH] src/basic/missing.h: check for missing strndupa
@@ -73,7 +73,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
  51 files changed, 62 insertions(+)
 
 diff --git a/meson.build b/meson.build
-index 11cf56efee..5bd6602e03 100644
+index 3421da3a4d..ddef6fba91 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -480,6 +480,7 @@ foreach ident : ['secure_getenv', '__secure_getenv']
@@ -297,7 +297,7 @@ index ca9b399d8c..b864480a8c 100644
  int bus_property_get_triggered_unit(
                  sd_bus *bus,
 diff --git a/src/core/execute.c b/src/core/execute.c
-index 2a337b55a2..2a64675c5f 100644
+index 2f2de4d9cf..515b2fe748 100644
 --- a/src/core/execute.c
 +++ b/src/core/execute.c
 @@ -98,6 +98,7 @@
@@ -321,7 +321,7 @@ index a56f12f47f..6b8729ef67 100644
  #if HAVE_KMOD
  #include "module-util.h"
 diff --git a/src/core/service.c b/src/core/service.c
-index 701c145565..4ddc20ed7e 100644
+index 7b90822f68..4af076eeba 100644
 --- a/src/core/service.c
 +++ b/src/core/service.c
 @@ -41,6 +41,7 @@
@@ -669,7 +669,7 @@ index 65c40de4c8..4ef9a0c6c8 100644
  _printf_(2,3)
  static void path_prepend(char **path, const char *fmt, ...) {
 diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
-index b28089be71..a7e2232299 100644
+index 9854270b27..71b5fab1e7 100644
 --- a/src/udev/udev-event.c
 +++ b/src/udev/udev-event.c
 @@ -34,6 +34,7 @@
diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
index 951bebc901..21d42e38ba 100644
--- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
+++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
@@ -1,4 +1,4 @@
-From f95192d87a46a2191cf4ebd47c64e04b138d7fac Mon Sep 17 00:00:00 2001
+From a434f2b4815a48d4cf007482ef64c288c73e120f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 26 Oct 2017 22:10:42 -0700
 Subject: [PATCH] Include netinet/if_ether.h
@@ -103,7 +103,7 @@ index 5ad396a57e..1dc007fe13 100644
 -#endif /* _UAPI_LINUX_IN6_H */
 +#endif /* _LINUX_IN6_H */
 diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
-index f99c12620b..4966d62656 100644
+index efbf7d7df3..86906332b6 100644
 --- a/src/libsystemd-network/sd-dhcp6-client.c
 +++ b/src/libsystemd-network/sd-dhcp6-client.c
 @@ -5,7 +5,6 @@
@@ -300,7 +300,7 @@ index 850b4f449e..6f85d41328 100644
  #include <netinet/in.h>
  #include <linux/netdevice.h>
 diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
-index 791fd64c39..a2825c920d 100644
+index eeba31c45d..0a2b0ed42b 100644
 --- a/src/network/networkd-route.c
 +++ b/src/network/networkd-route.c
 @@ -1,5 +1,6 @@
diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
index 46d0c7acef..7edd5452e7 100644
--- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
+++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
@@ -1,4 +1,4 @@
-From 9c0d0b61ffa4019b299e4c47f376ae823879dbf3 Mon Sep 17 00:00:00 2001
+From d566c9afe3a397b3323612641f49e12934c29b6a Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 14:56:21 +0800
 Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined
diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
index 9540f967bb..ecca9682ce 100644
--- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
@@ -1,4 +1,4 @@
-From 45b78e3dc3edead4fc9883dd5a9877f473367bf7 Mon Sep 17 00:00:00 2001
+From 0c49f309d60aa3751add1b8261bc69840e269c50 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 15:00:06 +0800
 Subject: [PATCH] add missing FTW_ macros for musl
@@ -10,6 +10,7 @@ This is to avoid build failures like below for musl.
 Upstream-Status: Inappropriate [musl specific]
 
 Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+
 ---
  src/basic/missing_type.h | 20 ++++++++++++++++++++
  src/shared/mount-setup.c |  1 +
diff --git a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch
index 35d24b334d..8dfb56fc03 100644
--- a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch
+++ b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch
@@ -1,4 +1,4 @@
-From 943b4258b870c65caaa56fe4dad0d9c7281fdb1d Mon Sep 17 00:00:00 2001
+From 2d9f6863b676185d43775503cd9b41c74996c543 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 15:03:47 +0800
 Subject: [PATCH] fix missing of __register_atfork for non-glibc builds
@@ -12,7 +12,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/src/basic/process-util.c b/src/basic/process-util.c
-index 14259ea8df..18681838ef 100644
+index 461bbfe9a5..2d06f9f60a 100644
 --- a/src/basic/process-util.c
 +++ b/src/basic/process-util.c
 @@ -18,6 +18,9 @@
diff --git a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
index a0d8402288..e5e54ce12b 100644
--- a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
+++ b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
@@ -1,4 +1,4 @@
-From cceb2bba69b371868e89d435c5406b67cdd84d57 Mon Sep 17 00:00:00 2001
+From 7a333b5d0fdf99fc9667ed79dca2b8610b353ea3 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 15:12:41 +0800
 Subject: [PATCH] Use uintmax_t for handling rlim_t
@@ -87,10 +87,10 @@ index 23d108d5df..3e6fb438d7 100644
          return 1;
  }
 diff --git a/src/core/execute.c b/src/core/execute.c
-index 2a64675c5f..dca1e0e3b6 100644
+index 515b2fe748..7693f2d9a0 100644
 --- a/src/core/execute.c
 +++ b/src/core/execute.c
-@@ -5391,9 +5391,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
+@@ -5395,9 +5395,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
          for (unsigned i = 0; i < RLIM_NLIMITS; i++)
                  if (c->rlimit[i]) {
                          fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
diff --git a/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
index 1aee0fd7c5..ac82d4b1ef 100644
--- a/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
+++ b/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
@@ -1,4 +1,4 @@
-From c1ee5661fa24bf540a4880a9d528da8752be033b Mon Sep 17 00:00:00 2001
+From c79b81aea40f3b9edfa208f1350c9c6e4405ee82 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Wed, 28 Feb 2018 21:25:22 -0800
 Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl
diff --git a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
index fefa6cbaaa..89f2730d6e 100644
--- a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
@@ -1,4 +1,4 @@
-From ca9b1277fb4eb89bc2ca92440a280e318e882b66 Mon Sep 17 00:00:00 2001
+From ff17c6edd025250802b41d645d915fe89667e775 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <armccurdy@gmail.com>
 Date: Tue, 10 Oct 2017 14:33:30 -0700
 Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
diff --git a/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
index f9f3af1505..fffb89b079 100644
--- a/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+++ b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
@@ -1,4 +1,4 @@
-From 792f4718ebd5a156729be89a5b47e52dc4b62975 Mon Sep 17 00:00:00 2001
+From f8d43bdb082b042f292b57b1b9434eed90160726 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 27 May 2018 08:36:44 -0700
 Subject: [PATCH] Define glibc compatible basename() for non-glibc systems
diff --git a/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
index fb901e6653..ea2bbe8a9f 100644
--- a/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+++ b/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
@@ -1,4 +1,4 @@
-From 101f5ceea7e575622c4f07d2972aeb4d6b082e4b Mon Sep 17 00:00:00 2001
+From a3c31153614dfdb033cffa51ef27593cbc422e5b Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Wed, 4 Jul 2018 15:00:44 +0800
 Subject: [PATCH] Do not disable buffering when writing to oom_score_adj
@@ -25,7 +25,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/basic/process-util.c b/src/basic/process-util.c
-index 18681838ef..0fa71ccce0 100644
+index 2d06f9f60a..f86bd0b7dc 100644
 --- a/src/basic/process-util.c
 +++ b/src/basic/process-util.c
 @@ -1606,7 +1606,7 @@ int set_oom_score_adjust(int value) {
diff --git a/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
index ece115df8e..fd1725221b 100644
--- a/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+++ b/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
@@ -1,4 +1,4 @@
-From 01ac079433b999a4747acf7be6a3b5fa182c3faf Mon Sep 17 00:00:00 2001
+From 08c8d08e7d235b1ba1fa74a6731fabf9023f7fd0 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Tue, 10 Jul 2018 15:40:17 +0800
 Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi
diff --git a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
index 62a6c23e44..de23065814 100644
--- a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
+++ b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
@@ -1,4 +1,4 @@
-From df2470912f3197aa441b6751feace1454c7d1f84 Mon Sep 17 00:00:00 2001
+From 8bf36de4e197add998c6fceeaf22215c5007b6a4 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 15:18:00 +0800
 Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP
diff --git a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch
index b6b1dc35b2..d5fb3fbf19 100644
--- a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch
+++ b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch
@@ -1,4 +1,4 @@
-From e27ecb188503159a3f11bb1179ba1892cd080843 Mon Sep 17 00:00:00 2001
+From 3c4ae0a4dbec70379e8bc9838ebadbca02f889ab Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 15:27:54 +0800
 Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition
diff --git a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
index fea347242a..0143533973 100644
--- a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
+++ b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
@@ -1,4 +1,4 @@
-From 748c4cf040856857f24f4aeef6d996bd58573bd3 Mon Sep 17 00:00:00 2001
+From 39de54d812b37865bb4f3ab77c0b9312078c93aa Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 15:44:54 +0800
 Subject: [PATCH] avoid redefinition of prctl_mm_map structure
diff --git a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch
index 9a84d9c04a..818babc386 100644
--- a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch
+++ b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch
@@ -1,4 +1,4 @@
-From 647447e220e7e47e214c8258c7d4fbdb0da058aa Mon Sep 17 00:00:00 2001
+From 34d593d75e0be636d7a1775b038a0d8ff636bbcb Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Fri, 7 Aug 2020 15:19:27 +0000
 Subject: [PATCH] Handle missing LOCK_EX
diff --git a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
index 5d3e8d4e84..74529428bc 100644
--- a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
+++ b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
@@ -1,4 +1,4 @@
-From 85cf3d58ff1a9696f0754feffae7d81b8d1d9a43 Mon Sep 17 00:00:00 2001
+From ddf7d7b0c458c9c11d3952c2850159f413e70592 Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Fri, 7 Aug 2020 15:20:17 +0000
 Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un *
diff --git a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch
index c0286244dd..70305641f7 100644
--- a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch
+++ b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch
@@ -1,4 +1,4 @@
-From 9770c5873836e702c2a58cf3b439198415c82c28 Mon Sep 17 00:00:00 2001
+From 776df19769907397f2376f2665e83baac098d396 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 16:53:06 +0800
 Subject: [PATCH] test-json.c: define M_PIl
diff --git a/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
index 9028e147bf..d9e3a2ad98 100644
--- a/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
+++ b/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
@@ -1,4 +1,4 @@
-From 26da484391e20b36eb65c98872d1145261028c7a Mon Sep 17 00:00:00 2001
+From ee566f88b7de42c4c086230859d5c035d687fa9b Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Fri, 1 Mar 2019 15:22:15 +0800
 Subject: [PATCH] do not disable buffer in writing files
diff --git a/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
index 152a36229c..2aa9a59554 100644
--- a/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
+++ b/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
@@ -1,4 +1,4 @@
-From 5fa412dcebe89fd9f6f6003163f17e0dc719df34 Mon Sep 17 00:00:00 2001
+From 1ab39b2d8c173ee231e673829eeeb113ccba2cef Mon Sep 17 00:00:00 2001
 From: Scott Murray <scott.murray@konsulko.com>
 Date: Fri, 13 Sep 2019 19:26:27 -0400
 Subject: [PATCH] Handle __cpu_mask usage
diff --git a/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
index 95df83c94b..9e5a91c268 100644
--- a/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
+++ b/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
@@ -1,4 +1,4 @@
-From 4835f3ca2e277abd93e2d4a74ecfd7401f32862b Mon Sep 17 00:00:00 2001
+From d8ff6ef555c942388a3166a4e288da700368af31 Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Tue, 10 Mar 2020 11:05:20 +0000
 Subject: [PATCH] Handle missing gshadow
diff --git a/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
index 167f724add..414c255d67 100644
--- a/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
@@ -1,4 +1,4 @@
-From e90f18da3d2aef07ddd7d312ca8b34ff0324208e Mon Sep 17 00:00:00 2001
+From 51b1dd6db0239a1d3cf62aac84685fd02bba69e6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 12 Apr 2021 23:44:53 -0700
 Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl
diff --git a/meta/recipes-core/systemd/systemd_249.5.bb b/meta/recipes-core/systemd/systemd_249.6.bb
similarity index 99%
rename from meta/recipes-core/systemd/systemd_249.5.bb
rename to meta/recipes-core/systemd/systemd_249.6.bb
index 8bdc0ca028..242a53d22a 100644
--- a/meta/recipes-core/systemd/systemd_249.5.bb
+++ b/meta/recipes-core/systemd/systemd_249.6.bb
@@ -25,7 +25,6 @@ SRC_URI += "file://touchscreen.rules \
            file://0003-implment-systemd-sysv-install-for-OE.patch \
            file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \
            file://0001-test-parse-argument-Include-signal.h.patch \
-           file://0001-meson-use-partial_dependency-to-get-include-director.patch \
            "
 
 # patches needed by musl
-- 
2.20.1

[PATCH 18/36] xwayland: upgrade 21.1.2 -> 21.1.3

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin@gmail.com>

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

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

[PATCH 19/36] curl: update 7.79.1 -> 7.80.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-replace-krb5-config-with-pkg-config.patch | 44 -------------------
 .../curl/{curl_7.79.1.bb => curl_7.80.0.bb}   |  6 +--
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
 rename meta/recipes-support/curl/{curl_7.79.1.bb => curl_7.80.0.bb} (94%)

diff --git a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
deleted file mode 100644
index 330c6b67c3..0000000000
--- a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ed70f0623708b8a6c1f58a5d243d87c5ff45b24d Mon Sep 17 00:00:00 2001
-From: Roy Li <rongqing.li@windriver.com>
-Date: Tue, 26 Apr 2016 13:13:01 +0800
-Subject: [PATCH] replace krb5-config with pkg-config
-
-Upstream-Status: Accepted [https://github.com/curl/curl/pull/7916]
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5569a26..56b0380 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -1290,7 +1290,7 @@ AC_ARG_WITH(gssapi,
-   fi
- ])
- 
--: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
-+KRB5CONFIG=`which pkg-config`
- 
- save_CPPFLAGS="$CPPFLAGS"
- AC_MSG_CHECKING([if GSS-API support is requested])
-@@ -1301,7 +1301,7 @@ if test x"$want_gss" = xyes; then
-      if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
-         GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
-      elif test -f "$KRB5CONFIG"; then
--        GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
-+        GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi`
-      elif test "$GSSAPI_ROOT" != "yes"; then
-         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
-      fi
-@@ -1394,7 +1394,7 @@ if test x"$want_gss" = xyes; then
-         elif test -f "$KRB5CONFIG"; then
-            dnl krb5-config doesn't have --libs-only-L or similar, put everything
-            dnl into LIBS
--           gss_libs=`$KRB5CONFIG --libs gssapi`
-+           gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi`
-            LIBS="$gss_libs $LIBS"
-         else
-            case $host in
diff --git a/meta/recipes-support/curl/curl_7.79.1.bb b/meta/recipes-support/curl/curl_7.80.0.bb
similarity index 94%
rename from meta/recipes-support/curl/curl_7.79.1.bb
rename to meta/recipes-support/curl/curl_7.80.0.bb
index 919777ce36..7b47091933 100644
--- a/meta/recipes-support/curl/curl_7.79.1.bb
+++ b/meta/recipes-support/curl/curl_7.80.0.bb
@@ -9,11 +9,9 @@ SECTION = "console/network"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b"
 
-SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \
-           file://0001-replace-krb5-config-with-pkg-config.patch \
-           "
+SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2"
 
-SRC_URI[sha256sum] = "de62c4ab9a9316393962e8b94777a570bb9f71feb580fb4475e412f2f9387851"
+SRC_URI[sha256sum] = "dd0d150e49cd950aff35e16b628edf04927f0289df42883750cf952bb858189c"
 
 # Curl has used many names over the years...
 CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"
-- 
2.20.1

[PATCH 20/36] librsvg: update 2.52.3 -> 2.52.4

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...Update-checksums-for-modified-files-for-libc.patch | 11 ++++++-----
 .../librsvg/{librsvg_2.52.3.bb => librsvg_2.52.4.bb}  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename meta/recipes-gnome/librsvg/{librsvg_2.52.3.bb => librsvg_2.52.4.bb} (97%)

diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-Update-checksums-for-modified-files-for-libc.patch b/meta/recipes-gnome/librsvg/librsvg/0001-Update-checksums-for-modified-files-for-libc.patch
index 9454fab829..e6b0d3d960 100644
--- a/meta/recipes-gnome/librsvg/librsvg/0001-Update-checksums-for-modified-files-for-libc.patch
+++ b/meta/recipes-gnome/librsvg/librsvg/0001-Update-checksums-for-modified-files-for-libc.patch
@@ -1,23 +1,24 @@
-From 4616eab147c0f13434d5af072df518d8b6a6e15f Mon Sep 17 00:00:00 2001
+From 35cc5ce53a7c00d03dab9d58d37c2ec948082878 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Sun, 31 Oct 2021 20:28:21 +0100
 Subject: [PATCH] Update checksums for modified files for libc
 
 Upstream-Status: Inappropriate [previous patches need to be upstreamed]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
 ---
  vendor/libc/.cargo-checksum.json | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/vendor/libc/.cargo-checksum.json b/vendor/libc/.cargo-checksum.json
-index 594b40b..e164edf 100644
+index 8cf4eba..ac7cc51 100644
 --- a/vendor/libc/.cargo-checksum.json
 +++ b/vendor/libc/.cargo-checksum.json
 @@ -1 +1,5 @@
--{"files":{"CONTRIBUTING.md":"752eea5a703d11b485c6b5f195f51bd2c79aa5159b619ce09555c779e1fb586b","Cargo.toml":"e2e6d42ad9c86abd689894ac10de651f629fd88f4b1c442eb8c7da48b318ee6b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"8228847944f1332882fbb00275b6f30e4a8aad08a13569c25d52cac012cc2a47","build.rs":"8e0e8d33cc9e7c25cde75c2b502420f943266a681024169f94084774b422681d","rustfmt.toml":"eaa2ea84fc1ba0359b77680804903e07bb38d257ab11986b95b158e460f787b2","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"520300ff260d377930f2f456135ec9a3ac7740a949ce7bf5269c0dc60d56c0df","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"4cf1ca3940157caa735a5cdb478c450d1648669a87d7311cd7c4928c273bd273","src/macros.rs":"7844312c233a6889fa15395fe3106f6a8f6229211104a92f33ea3c9536eef763","src/psp.rs":"dd31aabd46171d474ec5828372e28588935120e7355c90c105360d8fa9264c1c","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/solid/aarch64.rs":"8cdae0cc37c43dabd4253a534e700bec6b6a57293c0c8e36c9ce16675d16799a","src/solid/arm.rs":"852b58a0837fde089cb9b5af131bf653daeb8c726f7540032756db8b7d4f8149","src/solid/mod.rs":"98dc29c3e5773318ba258a4a2b7407f25aa52d40885a0024fbe43676fe54d14b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"2546ad3eb6aecb95f916648bc63264117c92b4b4859532b34cb011e4c75a5a72","src/unix/bsd/apple/b64/aarch64/align.rs":"f0c321265dd7671f16106b84951ac7dd77ed2e65c6623cbf2d29e76531984770","src/unix/bsd/apple/b64/aarch64/mod.rs":"44c217a4f263afe7a97435de9323d20a96c37836f899ca0925306d4b7e073c27","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"f5e278a1af7fb358891d1c9be4eb7e815aaca0c5cb738d0c3604ba2208a856f7","src/unix/bsd/apple/b64/x86_64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/x86_64/mod.rs":"45e1947d0c5244e24b97f86167cddc855308d0cd628f3cf623b7bf0f56da1509","src/unix/bsd/apple/mod.rs":"61cf269b4f662c9ec23de61f050ae16427538fc20e942860f5a19e0afd97f4df","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"8295b8bb0dfd38d2cdb4d9192cdeeb534cc6c3b208170e64615fa3e0edb3e578","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"c4fbe97d56e7059a7b8894bc8f43b57a0c7c55a8d929fdcd95cfa1a5625e471d","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"2a215bd6136b8617aacedf9be738ccee94da9d29b418e9a78101d6291c182352","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"bf0a994e2079b8aad9da5efd3a3b9a7194a53ae60887a25c57964fb68499e847","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"295b3e3b67394f731d4e88d169e3d3d1d80026b99898745cd0d1d163f085ff61","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs":"ce9fc2fa6391499a44e7bfe01ce296ce1f273107bce86223f9bc4e3c29a5813c","src/unix/bsd/freebsdlike/freebsd/freebsd13/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/mod.rs":"b202bf8e3cb2fb21ea08b590223ee1f03f5034f1461aef7d1717247040ef8053","src/unix/bsd/freebsdlike/freebsd/powerpc.rs":"9ca3f82f88974e6db5569f2d76a5a3749b248a31747a6c0da5820492bdfeca42","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/unix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"c3a0111252e201c172b99e7d9cbee4cf088d3dd47995110e819f04276bccd198","src/unix/bsd/freebsdlike/mod.rs":"3a831afc700d55e94d89b87db6c995f281cf69fc4f43d7339ce464d479735fde","src/unix/bsd/mod.rs":"2fed08973739d7f6a7412b204724af64b1a915c712689c250cf9a08263ba05ff","src/unix/bsd/netbsdlike/mod.rs":"4e9da54e541773c7ad4cca9dade1df00f28f2fdac3f8df5957f4c74b7e082344","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"65dcb58d11e8d8028401a9d07ca3eb4cb4f053e04249cc877353449d84ccc4cb","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"513b1a72bc204d415e7adf3ea55b133c05849d7a195a6287e3b56859854efbe0","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"1afe5ef46b14397cdd68664b5b232e4f5b035b6db1d4cf411c899d51ebca9f30","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"dd91931d373b7ecaf6e2de25adadee10d16fa9b12c2cbacdff3eb291e1ba36af","src/unix/bsd/netbsdlike/openbsd/mod.rs":"ea4a056a0b78a4d73d359d44454ad96a4465872a916bd2a19b955fbc9070ca29","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"d31db31630289c85af3339dbe357998a21ca584cbae31607448fe2cf7675a4e1","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"f0219c43860134e3134361477a202e6c561d6543899377fbdbc86f442bc2415f","src/unix/haiku/native.rs":"44855f52906f607de137fc4baa8c6b1b9a26baaa666f25d5f7a7ec5e017c8be6","src/unix/haiku/x86_64.rs":"3ec3aeeb7ed208b8916f3e32d42bfd085ff5e16936a1a35d9a52789f043b7237","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"859814f5df89e28fd4b345db399d181e11e7ed413841b6ff703a1fcbdbf013ae","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"433c1530f602cc5ed26610c58055dde0c4ceea5e00150063b24ddc60768332a4","src/unix/linux_like/android/b32/mod.rs":"d971b98530a96f5892f98e1edc3133cf278d1b3939d77ab0a27a6323e0961715","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"8388bd3a0fcb5636bf965eee6dc95ae6860b85a2b555b387c868aa4d4e01ec89","src/unix/linux_like/android/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"8fe667d2b14abc5ac8aad32e16c3da24350471d8156eaea9ab4989f73dd9f9fc","src/unix/linux_like/android/b64/mod.rs":"d7bbbadafdb2cb2ff8e9cde3d89a03b9facaabb6b2d45705225d3ece1c5cce37","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"06b22dc184e85a988ab969c75cadc52b9878faeab0eb9d21215878c95fe07c19","src/unix/linux_like/android/mod.rs":"7066335e80984db42a80f56abdbda048f0773f0bdeb72f530e989d683d61ad8d","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"b71d37106750f57bc2dae4e9bcb473ff098ef48235827e41a1687a39825f0aa4","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"213e70ebed2703e14a9cf17666b21ecbf180b7bff7fa22fdbb36dbbd52df326d","src/unix/linux_like/linux/arch/generic/mod.rs":"ff1fe8fad4ea15d9bec3db25efcfcb4939190c5189f86cfa4d05825aa8c10956","src/unix/linux_like/linux/arch/mips/mod.rs":"e4a980b002105aaa057eb6568e1e2c6168ade5c00e13a31ef67e316ddffdb900","src/unix/linux_like/linux/arch/mod.rs":"466a29622e47c6c7f1500682b2eb17f5566dd81b322cd6348f0fdd355cec593a","src/unix/linux_like/linux/arch/powerpc/mod.rs":"1789eb5b41f75c29239795124a4a7cdcf7c8d213b88cf581b2f5bda08d7cf15b","src/unix/linux_like/linux/arch/sparc/mod.rs":"ded708124ee610267d011dee31fb02d1ec697c334aa822776ec95a7ddf6fc541","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"07adf9f4b96854062db518aaf08521fde0ad4a21a5c049efccba437bd97b2b5a","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"1cb5c0c9df3af2bbe131a91593583259fac9118931744c8435e197a394eb0462","src/unix/linux_like/linux/gnu/b32/mod.rs":"794dbcbae7dae8fd6b0b814573243197ceb532b56ef0772ad86b4b401478fcd9","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"0cd7348badb9c4f8a0db31a2503b30c456a2bfcc7a0e5919762b1e12f912c5ad","src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs":"ee5145a383386b716605a8d1ff3df212d418aae1aa1f37d2307d4f9cd1a08e99","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/linux/gnu/b32/sparc/mod.rs":"1bcec269a8416ccc48a384ca5765eaaa23f30f39f32311f50008ef4eeadafb2f","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"5317dbf2323577b89370bbee3894882b89d8333176db4f7b271ddc2f036ef43c","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs":"21a21503ef2e095f4371044915d4bfb07a8578011cb5c713cd9f45947b0b5730","src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs":"e78c3cd197f44832338b414d1a9bc0d194f44c74db77bd7bf830c1fff62b2690","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"c3730792dabcc166d8fd22929ef2633d49bc626875382dfcd401e8e125fb7a84","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"68bcb71bbfccb4e8648948e494366d94767ce96f36daab9c1329375cdd32a459","src/unix/linux_like/linux/gnu/b64/mod.rs":"6336065423c26b59681fd2ce77f1117ea36af13e163fdadaefd108bd8191e8c8","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"dbb8905e363ed4a2dfb984554ad9b6389d27f6a2d599ec2d80e38a6c7551a019","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"5b982c41097f4f91adcb0968290afeccb27dce1695a261c964d34ef85df87cf4","src/unix/linux_like/linux/gnu/b64/s390x.rs":"a9484dfd3c7ca1174537957bef997c3ba7ea41989cdf61ede22b1bbc45a667bf","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"26fda11bdce99372c2c246e60866b56d98beb9fb49a2f6b69347ecfd03d18255","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"5a5ce7c5c92f60d8900dce63d363a38f3126aaf5be981710e172bec96ef95ac6","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"f775ac2b754f90b63053fe22afe1d19d306b5404995568d6805baa9249fb617f","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"4ba1b58468f55254717366f50fdfd3e4114fde6dc442a56681926c4d7e5b6b0d","src/unix/linux_like/linux/gnu/mod.rs":"af3590c392bd06394cb307ccb993e66f53de7e2a0211c689dbb1845220475445","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"897cb04ee381cf64cd222a867f6c4f33936f502d011f54d87e74f19f81827701","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"6255abe2ee04986832d12b7b2190589580f2a43e9bfb285b32b5747227f62727","src/unix/linux_like/linux/musl/b32/hexagon.rs":"a8811791809672be8338e6e27d1c4fcf383c2f26585be8bf9ab2923b219de032","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"b9e9ff42363ebbb884ddf6445129ec4164471df45846874fc08f5f458e659254","src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"4592dc5f1f2fe888dfef85fa862d42d168e73a2c6f4fc052b58287d0f4d4ffcd","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"a19a8decfab185af3cebd34aae4b15082e7552be573904b8c1a3f0c0e493ef34","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"798a9229d70ce235394f2dd625f6c4c1e10519a94382dc5b091952b638ae2928","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"a73035c6d9b776f13b839008e15c04c2c53455571efd06664affcb047e457112","src/unix/linux_like/linux/musl/b64/mips64.rs":"2744895451f3a777fbe54f7f2695be53310b965fd62084c9b7e9121c7fe28346","src/unix/linux_like/linux/musl/b64/mod.rs":"d18abc0aeba2e26342bf3416a4dba0836db2bb0ee013b0a39629475cf8640289","src/unix/linux_like/linux/musl/b64/powerpc64.rs":"e5a55525b42493923956d668f978fb45e22d51deea00ce5edbfddf76ff19c741","src/unix/linux_like/linux/musl/b64/s390x.rs":"03dfec6794d93cb31a7c52b2d53a0973755168f91f8fa437cc5dbd54882c8ee7","src/unix/linux_like/linux/musl/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/musl/b64/x86_64/mod.rs":"0dd168f5a6881f32e5239fb312b23cf137b800d0ff323286a92c8a2c382b5456","src/unix/linux_like/linux/musl/mod.rs":"55ccd71342276ccb4c441a4bc2772aebfd163af299669b658c6c8c6add331ec3","src/unix/linux_like/linux/no_align.rs":"5ed04c53bf9d27da9b4d65ba7625c6ac53330162683d1b3df98950caafa3507b","src/unix/linux_like/linux/uclibc/align.rs":"9ed16138d8e439bd90930845a65eafa7ebd67366e6bf633936d44014f6e4c959","src/unix/linux_like/linux/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/arm/mod.rs":"1e3bf809508b5872949136859bf48ddf58b7d24ae9f0b663e79f0efd1aaeb6a6","src/unix/linux_like/linux/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs":"fa4102d9a596d90de604ce2962b0e64f184dfbf10552a4c3ecf28f12d4704379","src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/linux_like/linux/uclibc/mips/mod.rs":"a2877679fef0f14f54a89ccbc41fb02f0c25bf6e536f9eb2cb2fa437e1d3f739","src/unix/linux_like/linux/uclibc/mod.rs":"82d504d3aa12cb0f7933980f81c4708fa6e070d4c57efdf407f2de05b71bc06d","src/unix/linux_like/linux/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/linux_like/linux/uclibc/x86_64/l4re.rs":"024eba5753e852dbdd212427351affe7e83f9916c1864bce414d7aa2618f192e","src/unix/linux_like/linux/uclibc/x86_64/mod.rs":"66e8f5b7509a6e638b8b904906f89badbab0da8fb5b602d07ebd88649c4b961a","src/unix/linux_like/linux/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/unix/linux_like/mod.rs":"b057cbf5c438e2842d987a571cf03673c49a627193f1077c984bcd326fbc305c","src/unix/mod.rs":"6b2b57833e37cd3231944696c8216eb587a2a68069346150cf321153eaf04d03","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/espidf/mod.rs":"c198cb4beccdab483be61c102da74dc51ac80f766797e33021f3110394ed5a3d","src/unix/newlib/mod.rs":"d7271c13748be08305d36f9af6f41f6950a7a1d6d4382149194a35d5fe2090de","src/unix/newlib/no_align.rs":"e0743b2179495a9514bc3a4d1781e492878c4ec834ee0085d0891dd1712e82fb","src/unix/newlib/powerpc/mod.rs":"2d0f7af28b47f7a2a6c210ebd1c1f33ed8eac62e56b5af2b856de2ad3fdc5187","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"cc4794afa4fbed9d6612894ea476228f9d8533950162d6416fc4d16073e1dac4","src/unix/solarish/compat.rs":"b07a5bfac925eb012003a459ba6bddbd3bfa9c44b3394da2ac5a602e54beae9c","src/unix/solarish/illumos.rs":"7d8f47fd37880715b449723688aaee568785325a46f1c360a05bdca13252278e","src/unix/solarish/mod.rs":"326b860f5b0a1f2ee0b06ed3bd6b9ed1a7a8b96330960e4baf03bc2b9096e83b","src/unix/solarish/solaris.rs":"65b005453aefa9b9d4fc860fe77cfec80d8c97a51342b15daf55fc3e808bb384","src/unix/solarish/x86_64.rs":"9d761573bdccbdd1ac61da571f7e96b5374df70241d9b72d45a069611f495085","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"aea3da66f2140f2a82dfc9c58f6e6531d2dd9c15ea696e0f95a0d4a2a187b5b6","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"2c945bce3ddd26bf20ff03fb4192c9c3f625f1308a479c5cb4bd4510a892629a","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"3c8c7edb7cdf5d0c44af936db2a94869585c69dfabeef30571b4f4e38375767a","src/windows/mod.rs":"1cd9223293255b994814487e28d9979fb8ebef4538a236c1aa47fdc166a149cc","src/windows/msvc/mod.rs":"860dc98245039bc3aa5782ef2b5798d009ea6655bd27a63f244be2206d2cb47f","src/windows/msvc/x86_64/align.rs":"648cf422b5a9c38eeb91754833780fd1f7aebca241c0391f1198ae2b286fde65","src/windows/msvc/x86_64/mod.rs":"a1f20fd9ed4eb6cddea3f0ebe70d791cdf00ed55ae10e23047e6b31c36c00c57","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4"},"package":"869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013"}
+-{"files":{"CONTRIBUTING.md":"752eea5a703d11b485c6b5f195f51bd2c79aa5159b619ce09555c779e1fb586b","Cargo.toml":"d6f6253f05d207b6c676e5647b31ad0ca3f05da3ac05db47f81d4ebd901ba22f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"8228847944f1332882fbb00275b6f30e4a8aad08a13569c25d52cac012cc2a47","build.rs":"a71b92db5077b33af4ee6f1de33574ac33c2b292840eddbe3f7cce37f1fb16b9","rustfmt.toml":"eaa2ea84fc1ba0359b77680804903e07bb38d257ab11986b95b158e460f787b2","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"520300ff260d377930f2f456135ec9a3ac7740a949ce7bf5269c0dc60d56c0df","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"e92c56b42f1bd1b9e66be2a9b73aca6ba29024b9bd17c16f327dfbe8831e3f86","src/macros.rs":"c1a299d5327ba033f079388f8ac8a44848f9aeff6a72e9be6dfa70f4769cc619","src/psp.rs":"dd31aabd46171d474ec5828372e28588935120e7355c90c105360d8fa9264c1c","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/solid/aarch64.rs":"8cdae0cc37c43dabd4253a534e700bec6b6a57293c0c8e36c9ce16675d16799a","src/solid/arm.rs":"852b58a0837fde089cb9b5af131bf653daeb8c726f7540032756db8b7d4f8149","src/solid/mod.rs":"98dc29c3e5773318ba258a4a2b7407f25aa52d40885a0024fbe43676fe54d14b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"2546ad3eb6aecb95f916648bc63264117c92b4b4859532b34cb011e4c75a5a72","src/unix/bsd/apple/b64/aarch64/align.rs":"f0c321265dd7671f16106b84951ac7dd77ed2e65c6623cbf2d29e76531984770","src/unix/bsd/apple/b64/aarch64/mod.rs":"44c217a4f263afe7a97435de9323d20a96c37836f899ca0925306d4b7e073c27","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"f5e278a1af7fb358891d1c9be4eb7e815aaca0c5cb738d0c3604ba2208a856f7","src/unix/bsd/apple/b64/x86_64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/x86_64/mod.rs":"8c87c5855038aae5d433c8f5eb3b29b0a175879a0245342b3bfd83bdf4cfd936","src/unix/bsd/apple/mod.rs":"96f101bdab46a9f0a5249a8143d4a9def055284a0c2bd62bce15532a5bed428c","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"8295b8bb0dfd38d2cdb4d9192cdeeb534cc6c3b208170e64615fa3e0edb3e578","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"6ea4129eb5d6da5c09f8cf3692b5e7716f058b48d1e8c61115691709eda7ce51","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"2a215bd6136b8617aacedf9be738ccee94da9d29b418e9a78101d6291c182352","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"bf0a994e2079b8aad9da5efd3a3b9a7194a53ae60887a25c57964fb68499e847","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"295b3e3b67394f731d4e88d169e3d3d1d80026b99898745cd0d1d163f085ff61","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs":"98f6af2021b434f9c3197094312b457774381220f31a22c3b15b1fe8a60cb365","src/unix/bsd/freebsdlike/freebsd/freebsd13/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/mod.rs":"6b825079ffe3f9aec6e78ea6b50acedcb91a4e1312d721105b7f8b1555f254df","src/unix/bsd/freebsdlike/freebsd/powerpc.rs":"9ca3f82f88974e6db5569f2d76a5a3749b248a31747a6c0da5820492bdfeca42","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/unix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"c3a0111252e201c172b99e7d9cbee4cf088d3dd47995110e819f04276bccd198","src/unix/bsd/freebsdlike/mod.rs":"98d322b22050a80636841287d9ed12549a2004a9dbe151763e5b1270f5e73ea3","src/unix/bsd/mod.rs":"2fed08973739d7f6a7412b204724af64b1a915c712689c250cf9a08263ba05ff","src/unix/bsd/netbsdlike/mod.rs":"4e9da54e541773c7ad4cca9dade1df00f28f2fdac3f8df5957f4c74b7e082344","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"65dcb58d11e8d8028401a9d07ca3eb4cb4f053e04249cc877353449d84ccc4cb","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"f6de6981382af87518e4a5b6d26c2ea551ed74640dd7166107a824af30ced243","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"1afe5ef46b14397cdd68664b5b232e4f5b035b6db1d4cf411c899d51ebca9f30","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"dd91931d373b7ecaf6e2de25adadee10d16fa9b12c2cbacdff3eb291e1ba36af","src/unix/bsd/netbsdlike/openbsd/mod.rs":"47aaab2bd8238e937112ff17e8262945c8e5865d5e696f218b11c1da59830808","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"d31db31630289c85af3339dbe357998a21ca584cbae31607448fe2cf7675a4e1","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"80a6cfb58acbbc471dbd412dd76a41f372befc8f217fb1671ed4ce8d391dced0","src/unix/haiku/native.rs":"44855f52906f607de137fc4baa8c6b1b9a26baaa666f25d5f7a7ec5e017c8be6","src/unix/haiku/x86_64.rs":"3ec3aeeb7ed208b8916f3e32d42bfd085ff5e16936a1a35d9a52789f043b7237","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"859814f5df89e28fd4b345db399d181e11e7ed413841b6ff703a1fcbdbf013ae","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"433c1530f602cc5ed26610c58055dde0c4ceea5e00150063b24ddc60768332a4","src/unix/linux_like/android/b32/mod.rs":"d971b98530a96f5892f98e1edc3133cf278d1b3939d77ab0a27a6323e0961715","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"8388bd3a0fcb5636bf965eee6dc95ae6860b85a2b555b387c868aa4d4e01ec89","src/unix/linux_like/android/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"8fe667d2b14abc5ac8aad32e16c3da24350471d8156eaea9ab4989f73dd9f9fc","src/unix/linux_like/android/b64/mod.rs":"d7bbbadafdb2cb2ff8e9cde3d89a03b9facaabb6b2d45705225d3ece1c5cce37","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"06b22dc184e85a988ab969c75cadc52b9878faeab0eb9d21215878c95fe07c19","src/unix/linux_like/android/mod.rs":"07cebaa8d953446b8df5cb7c5de3932ae85b04d9e9993e3a3a126ff8f15111a4","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"b71d37106750f57bc2dae4e9bcb473ff098ef48235827e41a1687a39825f0aa4","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"213e70ebed2703e14a9cf17666b21ecbf180b7bff7fa22fdbb36dbbd52df326d","src/unix/linux_like/linux/arch/generic/mod.rs":"1618634d37348032f5ce1dc9df1aaa1f1681bca4a275f23d41f42098c4d3b423","src/unix/linux_like/linux/arch/mips/mod.rs":"dac02cd01dbd3b222286887c64d398c031afc08d38850c2b3ce2fe7158d888e0","src/unix/linux_like/linux/arch/mod.rs":"466a29622e47c6c7f1500682b2eb17f5566dd81b322cd6348f0fdd355cec593a","src/unix/linux_like/linux/arch/powerpc/mod.rs":"1789eb5b41f75c29239795124a4a7cdcf7c8d213b88cf581b2f5bda08d7cf15b","src/unix/linux_like/linux/arch/sparc/mod.rs":"e7139d3bfb291a283c767e6201eac8bbb58c91839a36fa56bfe500fcb3aa754a","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"5e40c273b767c369a46c3315c7cfde97379944ed63c74735e98d4dae2c49d414","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"20b4c897fb3f63e31a04849b348ec8e6e6405ce9463048d411114f8c9dbabd8a","src/unix/linux_like/linux/gnu/b32/mod.rs":"794dbcbae7dae8fd6b0b814573243197ceb532b56ef0772ad86b4b401478fcd9","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"0cd7348badb9c4f8a0db31a2503b30c456a2bfcc7a0e5919762b1e12f912c5ad","src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs":"ee5145a383386b716605a8d1ff3df212d418aae1aa1f37d2307d4f9cd1a08e99","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/linux/gnu/b32/sparc/mod.rs":"a2c4ae8f31a74e4843b8ff4b6507419f403b52713169fcee9b1b24eb2324162a","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"525ee4917b54790cefc1298ec1015cea6332d818d9c7475434e94d06afdd59c0","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs":"21a21503ef2e095f4371044915d4bfb07a8578011cb5c713cd9f45947b0b5730","src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs":"e78c3cd197f44832338b414d1a9bc0d194f44c74db77bd7bf830c1fff62b2690","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"d179cbb462c451ff8805029b2b922c4bf90e35f667e80d716d5064f563aebc52","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"7d456da436017cb388b65b2c4b626c83b489cbb19a591673b9c627a608d53cfc","src/unix/linux_like/linux/gnu/b64/mod.rs":"6336065423c26b59681fd2ce77f1117ea36af13e163fdadaefd108bd8191e8c8","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"dbb8905e363ed4a2dfb984554ad9b6389d27f6a2d599ec2d80e38a6c7551a019","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"5b982c41097f4f91adcb0968290afeccb27dce1695a261c964d34ef85df87cf4","src/unix/linux_like/linux/gnu/b64/s390x.rs":"fce37140468f8914411eed0b25a882e60e1b54bcffcd33d6263a91b57d04f6c1","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"518ef78da0d81fe74cec30be411145d763fdfd249de4d108602fd0995781f590","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"76cba0a3f9456a968d2ae6ea587162b2ff04278dc5250cb176395c936579771b","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"f775ac2b754f90b63053fe22afe1d19d306b5404995568d6805baa9249fb617f","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"4ba1b58468f55254717366f50fdfd3e4114fde6dc442a56681926c4d7e5b6b0d","src/unix/linux_like/linux/gnu/mod.rs":"af3590c392bd06394cb307ccb993e66f53de7e2a0211c689dbb1845220475445","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"88ce2c4105c07c1262495e0ff1bd53f3ceec99adba9c20c612439838b4dbfdd6","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"6255abe2ee04986832d12b7b2190589580f2a43e9bfb285b32b5747227f62727","src/unix/linux_like/linux/musl/b32/hexagon.rs":"10067cde5706e1173aa8e0a3a364cf44fe5b7a9f8b71cb086c653be71af00564","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"b9e9ff42363ebbb884ddf6445129ec4164471df45846874fc08f5f458e659254","src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"4592dc5f1f2fe888dfef85fa862d42d168e73a2c6f4fc052b58287d0f4d4ffcd","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"a19a8decfab185af3cebd34aae4b15082e7552be573904b8c1a3f0c0e493ef34","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"798a9229d70ce235394f2dd625f6c4c1e10519a94382dc5b091952b638ae2928","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"a73035c6d9b776f13b839008e15c04c2c53455571efd06664affcb047e457112","src/unix/linux_like/linux/musl/b64/mips64.rs":"2744895451f3a777fbe54f7f2695be53310b965fd62084c9b7e9121c7fe28346","src/unix/linux_like/linux/musl/b64/mod.rs":"d18abc0aeba2e26342bf3416a4dba0836db2bb0ee013b0a39629475cf8640289","src/unix/linux_like/linux/musl/b64/powerpc64.rs":"e5a55525b42493923956d668f978fb45e22d51deea00ce5edbfddf76ff19c741","src/unix/linux_like/linux/musl/b64/s390x.rs":"03dfec6794d93cb31a7c52b2d53a0973755168f91f8fa437cc5dbd54882c8ee7","src/unix/linux_like/linux/musl/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/musl/b64/x86_64/mod.rs":"0dd168f5a6881f32e5239fb312b23cf137b800d0ff323286a92c8a2c382b5456","src/unix/linux_like/linux/musl/mod.rs":"55ccd71342276ccb4c441a4bc2772aebfd163af299669b658c6c8c6add331ec3","src/unix/linux_like/linux/no_align.rs":"5ed04c53bf9d27da9b4d65ba7625c6ac53330162683d1b3df98950caafa3507b","src/unix/linux_like/linux/uclibc/align.rs":"9ed16138d8e439bd90930845a65eafa7ebd67366e6bf633936d44014f6e4c959","src/unix/linux_like/linux/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/arm/mod.rs":"1e3bf809508b5872949136859bf48ddf58b7d24ae9f0b663e79f0efd1aaeb6a6","src/unix/linux_like/linux/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs":"fa4102d9a596d90de604ce2962b0e64f184dfbf10552a4c3ecf28f12d4704379","src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/linux_like/linux/uclibc/mips/mod.rs":"a2877679fef0f14f54a89ccbc41fb02f0c25bf6e536f9eb2cb2fa437e1d3f739","src/unix/linux_like/linux/uclibc/mod.rs":"82d504d3aa12cb0f7933980f81c4708fa6e070d4c57efdf407f2de05b71bc06d","src/unix/linux_like/linux/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/linux_like/linux/uclibc/x86_64/l4re.rs":"024eba5753e852dbdd212427351affe7e83f9916c1864bce414d7aa2618f192e","src/unix/linux_like/linux/uclibc/x86_64/mod.rs":"66e8f5b7509a6e638b8b904906f89badbab0da8fb5b602d07ebd88649c4b961a","src/unix/linux_like/linux/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/unix/linux_like/mod.rs":"ffce98bdd208fd9d335c65feafbf0d9742bea67c7eec1ee48657f292132ec3f0","src/unix/mod.rs":"b72f18e053cca0ade0f0606f1848a773fcf1885c72cbb31889275e8195f060bd","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/espidf/mod.rs":"c198cb4beccdab483be61c102da74dc51ac80f766797e33021f3110394ed5a3d","src/unix/newlib/mod.rs":"d7271c13748be08305d36f9af6f41f6950a7a1d6d4382149194a35d5fe2090de","src/unix/newlib/no_align.rs":"e0743b2179495a9514bc3a4d1781e492878c4ec834ee0085d0891dd1712e82fb","src/unix/newlib/powerpc/mod.rs":"2d0f7af28b47f7a2a6c210ebd1c1f33ed8eac62e56b5af2b856de2ad3fdc5187","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"cc4794afa4fbed9d6612894ea476228f9d8533950162d6416fc4d16073e1dac4","src/unix/solarish/compat.rs":"b07a5bfac925eb012003a459ba6bddbd3bfa9c44b3394da2ac5a602e54beae9c","src/unix/solarish/illumos.rs":"7d8f47fd37880715b449723688aaee568785325a46f1c360a05bdca13252278e","src/unix/solarish/mod.rs":"ea9dd1c1d68927408342762ee8998a9628838974c91089f620c867910c29adba","src/unix/solarish/solaris.rs":"65b005453aefa9b9d4fc860fe77cfec80d8c97a51342b15daf55fc3e808bb384","src/unix/solarish/x86_64.rs":"9d761573bdccbdd1ac61da571f7e96b5374df70241d9b72d45a069611f495085","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"aea3da66f2140f2a82dfc9c58f6e6531d2dd9c15ea696e0f95a0d4a2a187b5b6","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"44ce56183380d18aedea9b7bec2edc5819e8529302c913bfe5d01f760155b82a","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"3c8c7edb7cdf5d0c44af936db2a94869585c69dfabeef30571b4f4e38375767a","src/windows/mod.rs":"1cd9223293255b994814487e28d9979fb8ebef4538a236c1aa47fdc166a149cc","src/windows/msvc/mod.rs":"c068271e00fca6b62bc4bf44bcf142cfc38caeded9b6c4e01d1ceef3ccf986f4","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4"},"package":"fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"}
 \ No newline at end of file
-+{"files":{"CONTRIBUTING.md":"752eea5a703d11b485c6b5f195f51bd2c79aa5159b619ce09555c779e1fb586b","Cargo.toml":"e2e6d42ad9c86abd689894ac10de651f629fd88f4b1c442eb8c7da48b318ee6b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"8228847944f1332882fbb00275b6f30e4a8aad08a13569c25d52cac012cc2a47","build.rs":"8e0e8d33cc9e7c25cde75c2b502420f943266a681024169f94084774b422681d","rustfmt.toml":"eaa2ea84fc1ba0359b77680804903e07bb38d257ab11986b95b158e460f787b2","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"520300ff260d377930f2f456135ec9a3ac7740a949ce7bf5269c0dc60d56c0df","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"4cf1ca3940157caa735a5cdb478c450d1648669a87d7311cd7c4928c273bd273","src/macros.rs":"7844312c233a6889fa15395fe3106f6a8f6229211104a92f33ea3c9536eef763","src/psp.rs":"dd31aabd46171d474ec5828372e28588935120e7355c90c105360d8fa9264c1c","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/solid/aarch64.rs":"8cdae0cc37c43dabd4253a534e700bec6b6a57293c0c8e36c9ce16675d16799a","src/solid/arm.rs":"852b58a0837fde089cb9b5af131bf653daeb8c726f7540032756db8b7d4f8149","src/solid/mod.rs":"98dc29c3e5773318ba258a4a2b7407f25aa52d40885a0024fbe43676fe54d14b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"2546ad3eb6aecb95f916648bc63264117c92b4b4859532b34cb011e4c75a5a72","src/unix/bsd/apple/b64/aarch64/align.rs":"f0c321265dd7671f16106b84951ac7dd77ed2e65c6623cbf2d29e76531984770","src/unix/bsd/apple/b64/aarch64/mod.rs":"44c217a4f263afe7a97435de9323d20a96c37836f899ca0925306d4b7e073c27","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"f5e278a1af7fb358891d1c9be4eb7e815aaca0c5cb738d0c3604ba2208a856f7","src/unix/bsd/apple/b64/x86_64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/x86_64/mod.rs":"45e1947d0c5244e24b97f86167cddc855308d0cd628f3cf623b7bf0f56da1509","src/unix/bsd/apple/mod.rs":"61cf269b4f662c9ec23de61f050ae16427538fc20e942860f5a19e0afd97f4df","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"8295b8bb0dfd38d2cdb4d9192cdeeb534cc6c3b208170e64615fa3e0edb3e578","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"c4fbe97d56e7059a7b8894bc8f43b57a0c7c55a8d929fdcd95cfa1a5625e471d","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"2a215bd6136b8617aacedf9be738ccee94da9d29b418e9a78101d6291c182352","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"bf0a994e2079b8aad9da5efd3a3b9a7194a53ae60887a25c57964fb68499e847","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"295b3e3b67394f731d4e88d169e3d3d1d80026b99898745cd0d1d163f085ff61","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs":"ce9fc2fa6391499a44e7bfe01ce296ce1f273107bce86223f9bc4e3c29a5813c","src/unix/bsd/freebsdlike/freebsd/freebsd13/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/mod.rs":"b202bf8e3cb2fb21ea08b590223ee1f03f5034f1461aef7d1717247040ef8053","src/unix/bsd/freebsdlike/freebsd/powerpc.rs":"9ca3f82f88974e6db5569f2d76a5a3749b248a31747a6c0da5820492bdfeca42","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/unix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"c3a0111252e201c172b99e7d9cbee4cf088d3dd47995110e819f04276bccd198","src/unix/bsd/freebsdlike/mod.rs":"3a831afc700d55e94d89b87db6c995f281cf69fc4f43d7339ce464d479735fde","src/unix/bsd/mod.rs":"2fed08973739d7f6a7412b204724af64b1a915c712689c250cf9a08263ba05ff","src/unix/bsd/netbsdlike/mod.rs":"4e9da54e541773c7ad4cca9dade1df00f28f2fdac3f8df5957f4c74b7e082344","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"65dcb58d11e8d8028401a9d07ca3eb4cb4f053e04249cc877353449d84ccc4cb","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"513b1a72bc204d415e7adf3ea55b133c05849d7a195a6287e3b56859854efbe0","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"1afe5ef46b14397cdd68664b5b232e4f5b035b6db1d4cf411c899d51ebca9f30","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"dd91931d373b7ecaf6e2de25adadee10d16fa9b12c2cbacdff3eb291e1ba36af","src/unix/bsd/netbsdlike/openbsd/mod.rs":"ea4a056a0b78a4d73d359d44454ad96a4465872a916bd2a19b955fbc9070ca29","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"d31db31630289c85af3339dbe357998a21ca584cbae31607448fe2cf7675a4e1","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"f0219c43860134e3134361477a202e6c561d6543899377fbdbc86f442bc2415f","src/unix/haiku/native.rs":"44855f52906f607de137fc4baa8c6b1b9a26baaa666f25d5f7a7ec5e017c8be6","src/unix/haiku/x86_64.rs":"3ec3aeeb7ed208b8916f3e32d42bfd085ff5e16936a1a35d9a52789f043b7237","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"859814f5df89e28fd4b345db399d181e11e7ed413841b6ff703a1fcbdbf013ae","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"433c1530f602cc5ed26610c58055dde0c4ceea5e00150063b24ddc60768332a4","src/unix/linux_like/android/b32/mod.rs":"d971b98530a96f5892f98e1edc3133cf278d1b3939d77ab0a27a6323e0961715","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"8388bd3a0fcb5636bf965eee6dc95ae6860b85a2b555b387c868aa4d4e01ec89","src/unix/linux_like/android/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"8fe667d2b14abc5ac8aad32e16c3da24350471d8156eaea9ab4989f73dd9f9fc","src/unix/linux_like/android/b64/mod.rs":"d7bbbadafdb2cb2ff8e9cde3d89a03b9facaabb6b2d45705225d3ece1c5cce37","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"06b22dc184e85a988ab969c75cadc52b9878faeab0eb9d21215878c95fe07c19","src/unix/linux_like/android/mod.rs":"7066335e80984db42a80f56abdbda048f0773f0bdeb72f530e989d683d61ad8d","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"b71d37106750f57bc2dae4e9bcb473ff098ef48235827e41a1687a39825f0aa4","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"213e70ebed2703e14a9cf17666b21ecbf180b7bff7fa22fdbb36dbbd52df326d","src/unix/linux_like/linux/arch/generic/mod.rs":"ff1fe8fad4ea15d9bec3db25efcfcb4939190c5189f86cfa4d05825aa8c10956","src/unix/linux_like/linux/arch/mips/mod.rs":"e4a980b002105aaa057eb6568e1e2c6168ade5c00e13a31ef67e316ddffdb900","src/unix/linux_like/linux/arch/mod.rs":"466a29622e47c6c7f1500682b2eb17f5566dd81b322cd6348f0fdd355cec593a","src/unix/linux_like/linux/arch/powerpc/mod.rs":"1789eb5b41f75c29239795124a4a7cdcf7c8d213b88cf581b2f5bda08d7cf15b","src/unix/linux_like/linux/arch/sparc/mod.rs":"ded708124ee610267d011dee31fb02d1ec697c334aa822776ec95a7ddf6fc541","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"07adf9f4b96854062db518aaf08521fde0ad4a21a5c049efccba437bd97b2b5a","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"1cb5c0c9df3af2bbe131a91593583259fac9118931744c8435e197a394eb0462","src/unix/linux_like/linux/gnu/b32/mod.rs":"794dbcbae7dae8fd6b0b814573243197ceb532b56ef0772ad86b4b401478fcd9","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"0cd7348badb9c4f8a0db31a2503b30c456a2bfcc7a0e5919762b1e12f912c5ad","src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs":"ee5145a383386b716605a8d1ff3df212d418aae1aa1f37d2307d4f9cd1a08e99","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/linux/gnu/b32/sparc/mod.rs":"1bcec269a8416ccc48a384ca5765eaaa23f30f39f32311f50008ef4eeadafb2f","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"5317dbf2323577b89370bbee3894882b89d8333176db4f7b271ddc2f036ef43c","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs":"21a21503ef2e095f4371044915d4bfb07a8578011cb5c713cd9f45947b0b5730","src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs":"e78c3cd197f44832338b414d1a9bc0d194f44c74db77bd7bf830c1fff62b2690","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"c3730792dabcc166d8fd22929ef2633d49bc626875382dfcd401e8e125fb7a84","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"68bcb71bbfccb4e8648948e494366d94767ce96f36daab9c1329375cdd32a459","src/unix/linux_like/linux/gnu/b64/mod.rs":"6336065423c26b59681fd2ce77f1117ea36af13e163fdadaefd108bd8191e8c8","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"dbb8905e363ed4a2dfb984554ad9b6389d27f6a2d599ec2d80e38a6c7551a019","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"5b982c41097f4f91adcb0968290afeccb27dce1695a261c964d34ef85df87cf4","src/unix/linux_like/linux/gnu/b64/s390x.rs":"a9484dfd3c7ca1174537957bef997c3ba7ea41989cdf61ede22b1bbc45a667bf","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"26fda11bdce99372c2c246e60866b56d98beb9fb49a2f6b69347ecfd03d18255","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"5a5ce7c5c92f60d8900dce63d363a38f3126aaf5be981710e172bec96ef95ac6","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"f775ac2b754f90b63053fe22afe1d19d306b5404995568d6805baa9249fb617f","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"4ba1b58468f55254717366f50fdfd3e4114fde6dc442a56681926c4d7e5b6b0d","src/unix/linux_like/linux/gnu/mod.rs":"af3590c392bd06394cb307ccb993e66f53de7e2a0211c689dbb1845220475445","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"897cb04ee381cf64cd222a867f6c4f33936f502d011f54d87e74f19f81827701","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"6255abe2ee04986832d12b7b2190589580f2a43e9bfb285b32b5747227f62727","src/unix/linux_like/linux/musl/b32/hexagon.rs":"a8811791809672be8338e6e27d1c4fcf383c2f26585be8bf9ab2923b219de032","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"b9e9ff42363ebbb884ddf6445129ec4164471df45846874fc08f5f458e659254","src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"4592dc5f1f2fe888dfef85fa862d42d168e73a2c6f4fc052b58287d0f4d4ffcd","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"a19a8decfab185af3cebd34aae4b15082e7552be573904b8c1a3f0c0e493ef34","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"798a9229d70ce235394f2dd625f6c4c1e10519a94382dc5b091952b638ae2928","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"a73035c6d9b776f13b839008e15c04c2c53455571efd06664affcb047e457112","src/unix/linux_like/linux/musl/b64/mips64.rs":"2744895451f3a777fbe54f7f2695be53310b965fd62084c9b7e9121c7fe28346",
++{"files":{"CONTRIBUTING.md":"752eea5a703d11b485c6b5f195f51bd2c79aa5159b619ce09555c779e1fb586b","Cargo.toml":"d6f6253f05d207b6c676e5647b31ad0ca3f05da3ac05db47f81d4ebd901ba22f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"8228847944f1332882fbb00275b6f30e4a8aad08a13569c25d52cac012cc2a47","build.rs":"a71b92db5077b33af4ee6f1de33574ac33c2b292840eddbe3f7cce37f1fb16b9","rustfmt.toml":"eaa2ea84fc1ba0359b77680804903e07bb38d257ab11986b95b158e460f787b2","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"520300ff260d377930f2f456135ec9a3ac7740a949ce7bf5269c0dc60d56c0df","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"e92c56b42f1bd1b9e66be2a9b73aca6ba29024b9bd17c16f327dfbe8831e3f86","src/macros.rs":"c1a299d5327ba033f079388f8ac8a44848f9aeff6a72e9be6dfa70f4769cc619","src/psp.rs":"dd31aabd46171d474ec5828372e28588935120e7355c90c105360d8fa9264c1c","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/solid/aarch64.rs":"8cdae0cc37c43dabd4253a534e700bec6b6a57293c0c8e36c9ce16675d16799a","src/solid/arm.rs":"852b58a0837fde089cb9b5af131bf653daeb8c726f7540032756db8b7d4f8149","src/solid/mod.rs":"98dc29c3e5773318ba258a4a2b7407f25aa52d40885a0024fbe43676fe54d14b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"2546ad3eb6aecb95f916648bc63264117c92b4b4859532b34cb011e4c75a5a72","src/unix/bsd/apple/b64/aarch64/align.rs":"f0c321265dd7671f16106b84951ac7dd77ed2e65c6623cbf2d29e76531984770","src/unix/bsd/apple/b64/aarch64/mod.rs":"44c217a4f263afe7a97435de9323d20a96c37836f899ca0925306d4b7e073c27","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"f5e278a1af7fb358891d1c9be4eb7e815aaca0c5cb738d0c3604ba2208a856f7","src/unix/bsd/apple/b64/x86_64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/x86_64/mod.rs":"8c87c5855038aae5d433c8f5eb3b29b0a175879a0245342b3bfd83bdf4cfd936","src/unix/bsd/apple/mod.rs":"96f101bdab46a9f0a5249a8143d4a9def055284a0c2bd62bce15532a5bed428c","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"8295b8bb0dfd38d2cdb4d9192cdeeb534cc6c3b208170e64615fa3e0edb3e578","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"6ea4129eb5d6da5c09f8cf3692b5e7716f058b48d1e8c61115691709eda7ce51","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"2a215bd6136b8617aacedf9be738ccee94da9d29b418e9a78101d6291c182352","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"bf0a994e2079b8aad9da5efd3a3b9a7194a53ae60887a25c57964fb68499e847","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"295b3e3b67394f731d4e88d169e3d3d1d80026b99898745cd0d1d163f085ff61","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs":"98f6af2021b434f9c3197094312b457774381220f31a22c3b15b1fe8a60cb365","src/unix/bsd/freebsdlike/freebsd/freebsd13/x86_64.rs":"2df36a7f122f6d6e5753cfb4d22e915cc80f6bc91c0161b3daae55a481bfd052","src/unix/bsd/freebsdlike/freebsd/mod.rs":"6b825079ffe3f9aec6e78ea6b50acedcb91a4e1312d721105b7f8b1555f254df","src/unix/bsd/freebsdlike/freebsd/powerpc.rs":"9ca3f82f88974e6db5569f2d76a5a3749b248a31747a6c0da5820492bdfeca42","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/unix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"c3a0111252e201c172b99e7d9cbee4cf088d3dd47995110e819f04276bccd198","src/unix/bsd/freebsdlike/mod.rs":"98d322b22050a80636841287d9ed12549a2004a9dbe151763e5b1270f5e73ea3","src/unix/bsd/mod.rs":"2fed08973739d7f6a7412b204724af64b1a915c712689c250cf9a08263ba05ff","src/unix/bsd/netbsdlike/mod.rs":"4e9da54e541773c7ad4cca9dade1df00f28f2fdac3f8df5957f4c74b7e082344","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"65dcb58d11e8d8028401a9d07ca3eb4cb4f053e04249cc877353449d84ccc4cb","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"f6de6981382af87518e4a5b6d26c2ea551ed74640dd7166107a824af30ced243","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"ee7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"1afe5ef46b14397cdd68664b5b232e4f5b035b6db1d4cf411c899d51ebca9f30","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"dd91931d373b7ecaf6e2de25adadee10d16fa9b12c2cbacdff3eb291e1ba36af","src/unix/bsd/netbsdlike/openbsd/mod.rs":"47aaab2bd8238e937112ff17e8262945c8e5865d5e696f218b11c1da59830808","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"d31db31630289c85af3339dbe357998a21ca584cbae31607448fe2cf7675a4e1","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"80a6cfb58acbbc471dbd412dd76a41f372befc8f217fb1671ed4ce8d391dced0","src/unix/haiku/native.rs":"44855f52906f607de137fc4baa8c6b1b9a26baaa666f25d5f7a7ec5e017c8be6","src/unix/haiku/x86_64.rs":"3ec3aeeb7ed208b8916f3e32d42bfd085ff5e16936a1a35d9a52789f043b7237","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"859814f5df89e28fd4b345db399d181e11e7ed413841b6ff703a1fcbdbf013ae","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"433c1530f602cc5ed26610c58055dde0c4ceea5e00150063b24ddc60768332a4","src/unix/linux_like/android/b32/mod.rs":"d971b98530a96f5892f98e1edc3133cf278d1b3939d77ab0a27a6323e0961715","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"8388bd3a0fcb5636bf965eee6dc95ae6860b85a2b555b387c868aa4d4e01ec89","src/unix/linux_like/android/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"8fe667d2b14abc5ac8aad32e16c3da24350471d8156eaea9ab4989f73dd9f9fc","src/unix/linux_like/android/b64/mod.rs":"d7bbbadafdb2cb2ff8e9cde3d89a03b9facaabb6b2d45705225d3ece1c5cce37","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"06b22dc184e85a988ab969c75cadc52b9878faeab0eb9d21215878c95fe07c19","src/unix/linux_like/android/mod.rs":"07cebaa8d953446b8df5cb7c5de3932ae85b04d9e9993e3a3a126ff8f15111a4","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"b71d37106750f57bc2dae4e9bcb473ff098ef48235827e41a1687a39825f0aa4","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"213e70ebed2703e14a9cf17666b21ecbf180b7bff7fa22fdbb36dbbd52df326d","src/unix/linux_like/linux/arch/generic/mod.rs":"1618634d37348032f5ce1dc9df1aaa1f1681bca4a275f23d41f42098c4d3b423","src/unix/linux_like/linux/arch/mips/mod.rs":"dac02cd01dbd3b222286887c64d398c031afc08d38850c2b3ce2fe7158d888e0","src/unix/linux_like/linux/arch/mod.rs":"466a29622e47c6c7f1500682b2eb17f5566dd81b322cd6348f0fdd355cec593a","src/unix/linux_like/linux/arch/powerpc/mod.rs":"1789eb5b41f75c29239795124a4a7cdcf7c8d213b88cf581b2f5bda08d7cf15b","src/unix/linux_like/linux/arch/sparc/mod.rs":"e7139d3bfb291a283c767e6201eac8bbb58c91839a36fa56bfe500fcb3aa754a","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"5e40c273b767c369a46c3315c7cfde97379944ed63c74735e98d4dae2c49d414","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"20b4c897fb3f63e31a04849b348ec8e6e6405ce9463048d411114f8c9dbabd8a","src/unix/linux_like/linux/gnu/b32/mod.rs":"794dbcbae7dae8fd6b0b814573243197ceb532b56ef0772ad86b4b401478fcd9","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"0cd7348badb9c4f8a0db31a2503b30c456a2bfcc7a0e5919762b1e12f912c5ad","src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs":"ee5145a383386b716605a8d1ff3df212d418aae1aa1f37d2307d4f9cd1a08e99","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/linux/gnu/b32/sparc/mod.rs":"a2c4ae8f31a74e4843b8ff4b6507419f403b52713169fcee9b1b24eb2324162a","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"525ee4917b54790cefc1298ec1015cea6332d818d9c7475434e94d06afdd59c0","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/ilp32.rs":"21a21503ef2e095f4371044915d4bfb07a8578011cb5c713cd9f45947b0b5730","src/unix/linux_like/linux/gnu/b64/aarch64/lp64.rs":"e78c3cd197f44832338b414d1a9bc0d194f44c74db77bd7bf830c1fff62b2690","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"d179cbb462c451ff8805029b2b922c4bf90e35f667e80d716d5064f563aebc52","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"7d456da436017cb388b65b2c4b626c83b489cbb19a591673b9c627a608d53cfc","src/unix/linux_like/linux/gnu/b64/mod.rs":"6336065423c26b59681fd2ce77f1117ea36af13e163fdadaefd108bd8191e8c8","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"dbb8905e363ed4a2dfb984554ad9b6389d27f6a2d599ec2d80e38a6c7551a019","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"5b982c41097f4f91adcb0968290afeccb27dce1695a261c964d34ef85df87cf4","src/unix/linux_like/linux/gnu/b64/s390x.rs":"fce37140468f8914411eed0b25a882e60e1b54bcffcd33d6263a91b57d04f6c1","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"518ef78da0d81fe74cec30be411145d763fdfd249de4d108602fd0995781f590","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"76cba0a3f9456a968d2ae6ea587162b2ff04278dc5250cb176395c936579771b","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"f775ac2b754f90b63053fe22afe1d19d306b5404995568d6805baa9249fb617f","src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs":"4ba1b58468f55254717366f50fdfd3e4114fde6dc442a56681926c4d7e5b6b0d","src/unix/linux_like/linux/gnu/mod.rs":"af3590c392bd06394cb307ccb993e66f53de7e2a0211c689dbb1845220475445","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"88ce2c4105c07c1262495e0ff1bd53f3ceec99adba9c20c612439838b4dbfdd6","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"6255abe2ee04986832d12b7b2190589580f2a43e9bfb285b32b5747227f62727","src/unix/linux_like/linux/musl/b32/hexagon.rs":"10067cde5706e1173aa8e0a3a364cf44fe5b7a9f8b71cb086c653be71af00564","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"b9e9ff42363ebbb884ddf6445129ec4164471df45846874fc08f5f458e659254","src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"4592dc5f1f2fe888dfef85fa862d42d168e73a2c6f4fc052b58287d0f4d4ffcd","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"a19a8decfab185af3cebd34aae4b15082e7552be573904b8c1a3f0c0e493ef34","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"798a9229d70ce235394f2dd625f6c4c1e10519a94382dc5b091952b638ae2928","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"a73035c6d9b776f13b839008e15c04c2c53455571efd06664affcb047e457112","src/unix/linux_like/linux/musl/b64/mips64.rs":"2744895451f3a777fbe54f7f2695be53310b965fd62084c9b7e9121c7fe28346",
 +"src/unix/linux_like/linux/musl/b64/mod.rs":"d847206d9f2d594c8febe780a938cdccf40d985dafc11e90f235947735a09bac",
 +"src/unix/linux_like/linux/musl/b64/powerpc64.rs":"e5a55525b42493923956d668f978fb45e22d51deea00ce5edbfddf76ff19c741","src/unix/linux_like/linux/musl/b64/s390x.rs":"03dfec6794d93cb31a7c52b2d53a0973755168f91f8fa437cc5dbd54882c8ee7","src/unix/linux_like/linux/musl/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/musl/b64/x86_64/mod.rs":"0dd168f5a6881f32e5239fb312b23cf137b800d0ff323286a92c8a2c382b5456",
 +"src/unix/linux_like/linux/musl/mod.rs":"ac08dd0891304a0e6f478a38bffa4fe8e6b27ad79094b2f7139c7a95082c3a18",
-+"src/unix/linux_like/linux/no_align.rs":"5ed04c53bf9d27da9b4d65ba7625c6ac53330162683d1b3df98950caafa3507b","src/unix/linux_like/linux/uclibc/align.rs":"9ed16138d8e439bd90930845a65eafa7ebd67366e6bf633936d44014f6e4c959","src/unix/linux_like/linux/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/arm/mod.rs":"1e3bf809508b5872949136859bf48ddf58b7d24ae9f0b663e79f0efd1aaeb6a6","src/unix/linux_like/linux/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs":"fa4102d9a596d90de604ce2962b0e64f184dfbf10552a4c3ecf28f12d4704379","src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/linux_like/linux/uclibc/mips/mod.rs":"a2877679fef0f14f54a89ccbc41fb02f0c25bf6e536f9eb2cb2fa437e1d3f739","src/unix/linux_like/linux/uclibc/mod.rs":"82d504d3aa12cb0f7933980f81c4708fa6e070d4c57efdf407f2de05b71bc06d","src/unix/linux_like/linux/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/linux_like/linux/uclibc/x86_64/l4re.rs":"024eba5753e852dbdd212427351affe7e83f9916c1864bce414d7aa2618f192e","src/unix/linux_like/linux/uclibc/x86_64/mod.rs":"66e8f5b7509a6e638b8b904906f89badbab0da8fb5b602d07ebd88649c4b961a","src/unix/linux_like/linux/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/unix/linux_like/mod.rs":"b057cbf5c438e2842d987a571cf03673c49a627193f1077c984bcd326fbc305c","src/unix/mod.rs":"6b2b57833e37cd3231944696c8216eb587a2a68069346150cf321153eaf04d03","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/espidf/mod.rs":"c198cb4beccdab483be61c102da74dc51ac80f766797e33021f3110394ed5a3d","src/unix/newlib/mod.rs":"d7271c13748be08305d36f9af6f41f6950a7a1d6d4382149194a35d5fe2090de","src/unix/newlib/no_align.rs":"e0743b2179495a9514bc3a4d1781e492878c4ec834ee0085d0891dd1712e82fb","src/unix/newlib/powerpc/mod.rs":"2d0f7af28b47f7a2a6c210ebd1c1f33ed8eac62e56b5af2b856de2ad3fdc5187","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"cc4794afa4fbed9d6612894ea476228f9d8533950162d6416fc4d16073e1dac4","src/unix/solarish/compat.rs":"b07a5bfac925eb012003a459ba6bddbd3bfa9c44b3394da2ac5a602e54beae9c","src/unix/solarish/illumos.rs":"7d8f47fd37880715b449723688aaee568785325a46f1c360a05bdca13252278e","src/unix/solarish/mod.rs":"326b860f5b0a1f2ee0b06ed3bd6b9ed1a7a8b96330960e4baf03bc2b9096e83b","src/unix/solarish/solaris.rs":"65b005453aefa9b9d4fc860fe77cfec80d8c97a51342b15daf55fc3e808bb384","src/unix/solarish/x86_64.rs":"9d761573bdccbdd1ac61da571f7e96b5374df70241d9b72d45a069611f495085","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"aea3da66f2140f2a82dfc9c58f6e6531d2dd9c15ea696e0f95a0d4a2a187b5b6","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"2c945bce3ddd26bf20ff03fb4192c9c3f625f1308a479c5cb4bd4510a892629a","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"3c8c7edb7cdf5d0c44af936db2a94869585c69dfabeef30571b4f4e38375767a","src/windows/mod.rs":"1cd9223293255b994814487e28d9979fb8ebef4538a236c1aa47fdc166a149cc","src/windows/msvc/mod.rs":"860dc98245039bc3aa5782ef2b5798d009ea6655bd27a63f244be2206d2cb47f","src/windows/msvc/x86_64/align.rs":"648cf422b5a9c38eeb91754833780fd1f7aebca241c0391f1198ae2b286fde65","src/windows/msvc/x86_64/mod.rs":"a1f20fd9ed4eb6cddea3f0ebe70d791cdf00ed55ae10e23047e6b31c36c00c57","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4"},"package":"869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013"}
++"src/unix/linux_like/linux/no_align.rs":"5ed04c53bf9d27da9b4d65ba7625c6ac53330162683d1b3df98950caafa3507b","src/unix/linux_like/linux/uclibc/align.rs":"9ed16138d8e439bd90930845a65eafa7ebd67366e6bf633936d44014f6e4c959","src/unix/linux_like/linux/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/arm/mod.rs":"1e3bf809508b5872949136859bf48ddf58b7d24ae9f0b663e79f0efd1aaeb6a6","src/unix/linux_like/linux/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs":"fa4102d9a596d90de604ce2962b0e64f184dfbf10552a4c3ecf28f12d4704379","src/unix/linux_like/linux/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/linux_like/linux/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/linux_like/linux/uclibc/mips/mod.rs":"a2877679fef0f14f54a89ccbc41fb02f0c25bf6e536f9eb2cb2fa437e1d3f739","src/unix/linux_like/linux/uclibc/mod.rs":"82d504d3aa12cb0f7933980f81c4708fa6e070d4c57efdf407f2de05b71bc06d","src/unix/linux_like/linux/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/linux_like/linux/uclibc/x86_64/l4re.rs":"024eba5753e852dbdd212427351affe7e83f9916c1864bce414d7aa2618f192e","src/unix/linux_like/linux/uclibc/x86_64/mod.rs":"66e8f5b7509a6e638b8b904906f89badbab0da8fb5b602d07ebd88649c4b961a","src/unix/linux_like/linux/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/unix/linux_like/mod.rs":"ffce98bdd208fd9d335c65feafbf0d9742bea67c7eec1ee48657f292132ec3f0","src/unix/mod.rs":"b72f18e053cca0ade0f0606f1848a773fcf1885c72cbb31889275e8195f060bd","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/espidf/mod.rs":"c198cb4beccdab483be61c102da74dc51ac80f766797e33021f3110394ed5a3d","src/unix/newlib/mod.rs":"d7271c13748be08305d36f9af6f41f6950a7a1d6d4382149194a35d5fe2090de","src/unix/newlib/no_align.rs":"e0743b2179495a9514bc3a4d1781e492878c4ec834ee0085d0891dd1712e82fb","src/unix/newlib/powerpc/mod.rs":"2d0f7af28b47f7a2a6c210ebd1c1f33ed8eac62e56b5af2b856de2ad3fdc5187","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"cc4794afa4fbed9d6612894ea476228f9d8533950162d6416fc4d16073e1dac4","src/unix/solarish/compat.rs":"b07a5bfac925eb012003a459ba6bddbd3bfa9c44b3394da2ac5a602e54beae9c","src/unix/solarish/illumos.rs":"7d8f47fd37880715b449723688aaee568785325a46f1c360a05bdca13252278e","src/unix/solarish/mod.rs":"ea9dd1c1d68927408342762ee8998a9628838974c91089f620c867910c29adba","src/unix/solarish/solaris.rs":"65b005453aefa9b9d4fc860fe77cfec80d8c97a51342b15daf55fc3e808bb384","src/unix/solarish/x86_64.rs":"9d761573bdccbdd1ac61da571f7e96b5374df70241d9b72d45a069611f495085","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"aea3da66f2140f2a82dfc9c58f6e6531d2dd9c15ea696e0f95a0d4a2a187b5b6","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"44ce56183380d18aedea9b7bec2edc5819e8529302c913bfe5d01f760155b82a","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"3c8c7edb7cdf5d0c44af936db2a94869585c69dfabeef30571b4f4e38375767a","src/windows/mod.rs":"1cd9223293255b994814487e28d9979fb8ebef4538a236c1aa47fdc166a149cc","src/windows/msvc/mod.rs":"c068271e00fca6b62bc4bf44bcf142cfc38caeded9b6c4e01d1ceef3ccf986f4","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4"},"package":"fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"}
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.52.4.bb
similarity index 97%
rename from meta/recipes-gnome/librsvg/librsvg_2.52.3.bb
rename to meta/recipes-gnome/librsvg/librsvg_2.52.4.bb
index f1d1a8f9f4..bbaaefcd23 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.52.4.bb
@@ -25,7 +25,7 @@ SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.pat
            file://0001-Update-checksums-for-modified-files-for-libc.patch \
            "
 
-SRC_URI[archive.sha256sum] = "36e7f5bc88d78608ea7f6c05e4afe4acc1606b9af13c2845d4385073d082b8a4"
+SRC_URI[archive.sha256sum] = "660ec8836a3a91587bc9384920132d4c38d1d1718c67fe160c5213fe4dec2928"
 
 # librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles
 # so we cannot use cargo class directly, but still need bits and pieces from it 
-- 
2.20.1

[PATCH 21/36] librstd-rs: submit patches upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0005-Add-base-definitions-for-riscv64-musl-libc.patch        | 1 +
 .../0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set.patch    | 1 +
 .../libstd-rs/0007-FIXUP-Correct-definitions-to-match-musl.patch | 1 +
 .../0008-Update-checksums-for-modified-files-for-rust.patch      | 1 +
 .../0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch | 1 +
 ...06-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch | 1 +
 ...007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch | 1 +
 7 files changed, 7 insertions(+)

diff --git a/meta/recipes-devtools/rust/libstd-rs/0005-Add-base-definitions-for-riscv64-musl-libc.patch b/meta/recipes-devtools/rust/libstd-rs/0005-Add-base-definitions-for-riscv64-musl-libc.patch
index 180e2b59ab..dedf9af415 100644
--- a/meta/recipes-devtools/rust/libstd-rs/0005-Add-base-definitions-for-riscv64-musl-libc.patch
+++ b/meta/recipes-devtools/rust/libstd-rs/0005-Add-base-definitions-for-riscv64-musl-libc.patch
@@ -5,6 +5,7 @@ Subject: [PATCH 5/8] Add base definitions for riscv64 + musl
 
 https://github.com/rust-lang/libc/pull/1994/commits/030a07761f61f3293d53752e60edbd330a9d718d
 
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2537]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Ralf Anton Beier <ralf_beier@me.com>
 ---
diff --git a/meta/recipes-devtools/rust/libstd-rs/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set.patch b/meta/recipes-devtools/rust/libstd-rs/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set.patch
index 047c4f2aab..a037d407e6 100644
--- a/meta/recipes-devtools/rust/libstd-rs/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set.patch
+++ b/meta/recipes-devtools/rust/libstd-rs/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set.patch
@@ -5,6 +5,7 @@ Subject: [PATCH 6/8] FIXUP: linux/musl/mod.rs: add riscv64 to b64 set
 
 https://github.com/rust-lang/libc/pull/1994/commits/30070c822be2ef399b2ba38cdc1d72ac694d65a3
 
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2537]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Ralf Anton Beier <ralf_beier@me.com>
 ---
diff --git a/meta/recipes-devtools/rust/libstd-rs/0007-FIXUP-Correct-definitions-to-match-musl.patch b/meta/recipes-devtools/rust/libstd-rs/0007-FIXUP-Correct-definitions-to-match-musl.patch
index 211d2e270b..aca6290fe7 100644
--- a/meta/recipes-devtools/rust/libstd-rs/0007-FIXUP-Correct-definitions-to-match-musl.patch
+++ b/meta/recipes-devtools/rust/libstd-rs/0007-FIXUP-Correct-definitions-to-match-musl.patch
@@ -5,6 +5,7 @@ Subject: [PATCH 7/8] FIXUP Correct definitions to match musl
 
 https://github.com/rust-lang/libc/pull/1994/commits/5f6a4d9745c79c81be63c708515ab116786554a3
 
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2537]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Ralf Anton Beier <ralf_beier@me.com>
 ---
diff --git a/meta/recipes-devtools/rust/libstd-rs/0008-Update-checksums-for-modified-files-for-rust.patch b/meta/recipes-devtools/rust/libstd-rs/0008-Update-checksums-for-modified-files-for-rust.patch
index 29131a0e1d..d513e9063a 100644
--- a/meta/recipes-devtools/rust/libstd-rs/0008-Update-checksums-for-modified-files-for-rust.patch
+++ b/meta/recipes-devtools/rust/libstd-rs/0008-Update-checksums-for-modified-files-for-rust.patch
@@ -3,6 +3,7 @@ From: Ralf Anton Beier <ralf_beier@me.com>
 Date: Sun, 8 Aug 2021 11:19:24 +0200
 Subject: [PATCH 8/8] Update checksums for modified files for rust
 
+Upstream-Status: Inappropriate [previous patches need to be upstreamed]
 Signed-off-by: Ralf Anton Beier <ralf_beier@me.com>
 ---
  vendor/libc-0.2.93/.cargo-checksum.json | 2 +-
diff --git a/meta/recipes-gnome/librsvg/librsvg/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch b/meta/recipes-gnome/librsvg/librsvg/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch
index c141e7a539..f47ebd586b 100644
--- a/meta/recipes-gnome/librsvg/librsvg/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch
+++ b/meta/recipes-gnome/librsvg/librsvg/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch
@@ -5,6 +5,7 @@ Subject: [PATCH 5/8] Add base definitions for riscv64 + musl - libc-0.2.93
 
 https://github.com/rust-lang/libc/pull/1994/commits/030a07761f61f3293d53752e60edbd330a9d718d
 
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2537]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Ralf Anton Beier <ralf_beier@me.com>
 ---
diff --git a/meta/recipes-gnome/librsvg/librsvg/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch b/meta/recipes-gnome/librsvg/librsvg/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch
index e993c45dea..ee995286e3 100644
--- a/meta/recipes-gnome/librsvg/librsvg/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch
+++ b/meta/recipes-gnome/librsvg/librsvg/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch
@@ -6,6 +6,7 @@ Subject: [PATCH 6/8] FIXUP: linux/musl/mod.rs: add riscv64 to b64 set -
 
 https://github.com/rust-lang/libc/pull/1994/commits/30070c822be2ef399b2ba38cdc1d72ac694d65a3
 
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2537]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Ralf Anton Beier <ralf_beier@me.com>
 ---
diff --git a/meta/recipes-gnome/librsvg/librsvg/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch b/meta/recipes-gnome/librsvg/librsvg/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch
index 77e6b0ae1b..e23aaa790e 100644
--- a/meta/recipes-gnome/librsvg/librsvg/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch
+++ b/meta/recipes-gnome/librsvg/librsvg/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch
@@ -5,6 +5,7 @@ Subject: [PATCH 7/8] FIXUP Correct definitions to match musl - libc-0.2.93
 
 https://github.com/rust-lang/libc/pull/1994/commits/5f6a4d9745c79c81be63c708515ab116786554a3
 
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2537]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Ralf Anton Beier <ralf_beier@me.com>
 ---
-- 
2.20.1

[PATCH 22/36] elfutils: update 0.185 -> 0.186

[Alexander Kanavin]

Drop glibc-2.34-fix.patch merged upstream.

Rework support for error() on non-glibc targets:
upstream now provides its own implementation, so we can drop
the patch that adds ours; said implementation isn't
build-tested with tests, so ptest has to be disabled on musl.
This, in turns, allows dropping 0004-Fix-error-on-musl.patch.

License-Update: copyright years
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{elfutils_0.185.bb => elfutils_0.186.bb}  |  12 +-
 ...ompilation-on-platforms-without-erro.patch |  54 +++++++
 .../elfutils/files/0002-musl-libs.patch       | 118 ---------------
 .../elfutils/files/0003-musl-utils.patch      |   6 +-
 .../files/0004-Fix-error-on-musl.patch        |  36 -----
 .../0015-config-eu.am-do-not-use-Werror.patch |   8 +-
 .../elfutils/files/glibc-2.34-fix.patch       | 138 ------------------
 7 files changed, 65 insertions(+), 307 deletions(-)
 rename meta/recipes-devtools/elfutils/{elfutils_0.185.bb => elfutils_0.186.bb} (95%)
 create mode 100644 meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
 delete mode 100644 meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
 delete mode 100644 meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
 delete mode 100644 meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.185.bb b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
similarity index 95%
rename from meta/recipes-devtools/elfutils/elfutils_0.185.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.186.bb
index f4769e3632..b3588a2196 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.185.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "elfutils is a collection of utilities and libraries to read, crea
 SECTION = "base"
 LICENSE = "GPLv2 & GPLv2+ & LGPLv3+ & GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://debuginfod/debuginfod-client.c;endline=27;md5=f8e9d171c401c493ec45a0b2992ea2ed \
+                    file://debuginfod/debuginfod-client.c;endline=27;md5=d2adfd8f5347d4c96e3c280393ce66da \
                     "
 DEPENDS = "zlib virtual/libintl"
 DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack "
@@ -22,20 +22,16 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://ptest.patch \
            file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
            file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \
-           file://glibc-2.34-fix.patch \
+           file://0001-debuginfod-fix-compilation-on-platforms-without-erro.patch \
            "
 SRC_URI:append:libc-musl = " \
-           file://0002-musl-libs.patch \
            file://0003-musl-utils.patch \
-           file://0004-Fix-error-on-musl.patch \
            file://0015-config-eu.am-do-not-use-Werror.patch \
            "
-SRC_URI[sha256sum] = "dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6"
-
-# remove at next version upgrade or when output changes
-PR = "r1"
+SRC_URI[sha256sum] = "7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177"
 
 inherit autotools gettext ptest pkgconfig
+PTEST_ENABLED:libc-musl = "0"
 
 EXTRA_OECONF = "--program-prefix=eu-"
 
diff --git a/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
new file mode 100644
index 0000000000..e80d96aaca
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
@@ -0,0 +1,54 @@
+From 99617d7ab5b01c322b0f27d4aa0dd91c61793a5e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Wed, 10 Nov 2021 21:17:48 -0300
+Subject: [PATCH] debuginfod: fix compilation on platforms without <error.h>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+"system.h" only declares the error() function, so it needs to be in an
+'extern "C"' block, otherwise linking fails.
+
+Since we are here, use quotes for "system.h" header, since it's a local
+header, not a system one.
+
+Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=90b9e91b961b794a4e58ab76d9191a5e7343584e]
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ debuginfod/ChangeLog      | 4 ++++
+ debuginfod/debuginfod.cxx | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
+index f06d3ee..822bd63 100644
+--- a/debuginfod/ChangeLog
++++ b/debuginfod/ChangeLog
+@@ -1,3 +1,7 @@
++2021-11-10  Érico N. Rolim  <erico.erc@gmail.com>
++
++	* debuginfod.cxx: include "system.h" under 'extern "C"' block.
++
+ 2021-11-05  Frank Ch. Eigler  <fche@redhat.com>
+ 
+ 	PR28430
+diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
+index 521cb52..764e7b9 100644
+--- a/debuginfod/debuginfod.cxx
++++ b/debuginfod/debuginfod.cxx
+@@ -33,11 +33,11 @@
+ 
+ extern "C" {
+ #include "printversion.h"
++#include "system.h"
+ }
+ 
+ #include "debuginfod.h"
+ #include <dwarf.h>
+-#include <system.h>
+ 
+ #include <argp.h>
+ #ifdef __GNUC__
+-- 
+2.20.1
+
diff --git a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
deleted file mode 100644
index c7360da7a7..0000000000
--- a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 0f4667f0bb4b000d74ade07e90bd690b7217a19d Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Fri, 23 Aug 2019 10:18:47 +0800
-Subject: [PATCH] musl-libs
-
-Collection of fixes needed to compile libelf and other libraries
-provided by elfutils for musl targets
-
-error is glibc specific API, so this patch will mostly not accepted
-upstream given that elfutils has been closely tied to glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Inappropriate [workaround for musl]
-
-Rebase to 0.177
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
----
- lib/error.h                    | 27 +++++++++++++++++++++++++++
- lib/fixedsizehash.h            |  1 -
- lib/libeu.h                    |  1 +
- libdwfl/linux-kernel-modules.c |  1 +
- libelf/elf.h                   |  7 +++++++
- 5 files changed, 36 insertions(+), 1 deletion(-)
- create mode 100644 lib/error.h
-
-diff --git a/lib/error.h b/lib/error.h
-new file mode 100644
-index 0000000..ef06827
---- /dev/null
-+++ b/lib/error.h
-@@ -0,0 +1,27 @@
-+#ifndef _ERROR_H_
-+#define _ERROR_H_
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+static unsigned int error_message_count = 0;
-+
-+static inline void error(int status, int errnum, const char* format, ...)
-+{
-+	va_list ap;
-+	fprintf(stderr, "%s: ", program_invocation_name);
-+	va_start(ap, format);
-+	vfprintf(stderr, format, ap);
-+	va_end(ap);
-+	if (errnum)
-+		fprintf(stderr, ": %s", strerror(errnum));
-+	fprintf(stderr, "\n");
-+	error_message_count++;
-+	if (status)
-+		exit(status);
-+}
-+
-+#endif	/* _ERROR_H_ */
-diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
-index dac2a5f..43016fc 100644
---- a/lib/fixedsizehash.h
-+++ b/lib/fixedsizehash.h
-@@ -30,7 +30,6 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/cdefs.h>
- 
- #include <system.h>
- 
-diff --git a/lib/libeu.h b/lib/libeu.h
-index ecb4d01..edc85e3 100644
---- a/lib/libeu.h
-+++ b/lib/libeu.h
-@@ -29,6 +29,7 @@
- #ifndef LIBEU_H
- #define LIBEU_H
- 
-+#include "system.h"
- #include <stddef.h>
- #include <stdint.h>
- 
-diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
-index c0f8dfa..aa78033 100644
---- a/libdwfl/linux-kernel-modules.c
-+++ b/libdwfl/linux-kernel-modules.c
-@@ -50,6 +50,7 @@
- #include <sys/utsname.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include "system.h"
- 
- /* If fts.h is included before config.h, its indirect inclusions may not
-    give us the right LFS aliases of these functions, so map them manually.  */
-diff --git a/libelf/elf.h b/libelf/elf.h
-index 8e3e618..1353890 100644
---- a/libelf/elf.h
-+++ b/libelf/elf.h
-@@ -19,6 +19,10 @@
- #ifndef _ELF_H
- #define	_ELF_H 1
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /* Standard ELF types.  */
- 
- #include <stdint.h>
-@@ -4102,4 +4106,7 @@ enum
- #define R_ARC_TLS_LE_S9		0x4a
- #define R_ARC_TLS_LE_32		0x4b
- 
-+#ifdef __cplusplus
-+}
-+#endif
- #endif	/* elf.h */
diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
index 2e379cdba6..85f8140330 100644
--- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
+++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
@@ -1,4 +1,4 @@
-From 2f94d488bf3daaa6a8548ee77120fc2506a9bbe3 Mon Sep 17 00:00:00 2001
+From 934d21dc0b06b95c7c65cb29c5096decd91d4d5f Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Fri, 23 Aug 2019 10:19:48 +0800
 Subject: [PATCH] musl-utils
@@ -57,7 +57,7 @@ index 2c6d91b..608646e 100644
  ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
  
 diff --git a/src/strip.c b/src/strip.c
-index 70fc8c0..d035d9e 100644
+index d5b753d..d6e1b64 100644
 --- a/src/strip.c
 +++ b/src/strip.c
 @@ -46,6 +46,13 @@
@@ -75,7 +75,7 @@ index 70fc8c0..d035d9e 100644
  
  /* Name and version of program.  */
 diff --git a/src/unstrip.c b/src/unstrip.c
-index e488e81..0e44456 100644
+index aacc9aa..5e71290 100644
 --- a/src/unstrip.c
 +++ b/src/unstrip.c
 @@ -52,6 +52,15 @@
diff --git a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
deleted file mode 100644
index 2fa60c333c..0000000000
--- a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 72819106d0e5666d172d39c24c19e4e7a3b8be0e Mon Sep 17 00:00:00 2001
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Date: Wed, 1 May 2019 22:15:03 +0100
-Subject: [PATCH] Fix error on musl:
-
-| ../../elfutils-0.176/tests/elfstrmerge.c: In function 'main':
-| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: error: 'ALLPERMS' undeclared (first use in this function); did you mean 'EPERM'?
-|        fdnew = open (fnew, O_WRONLY | O_CREAT, st.st_mode & ALLPERMS);
-|                                                             ^~~~~~~~
-|                                                             EPERM
-| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: note: each undeclared identifier is reported only once for each function it appears in
-
-Upstream-Status: Inappropriate [workaround in musl]
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
----
- tests/elfstrmerge.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
-index 197c6a5..3683672 100644
---- a/tests/elfstrmerge.c
-+++ b/tests/elfstrmerge.c
-@@ -33,6 +33,11 @@
- #include ELFUTILS_HEADER(dwelf)
- #include "elf-knowledge.h"
- 
-+/* for musl */
-+#ifndef ALLPERMS
-+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
-+#endif
-+
- /* The original ELF file.  */
- static int fd = -1;
- static Elf *elf = NULL;
diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
index 5cd6fffc27..c96cfd9777 100644
--- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
+++ b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
@@ -1,4 +1,4 @@
-From cfced441d4a6f2eca51d29c52240275bd6f54e49 Mon Sep 17 00:00:00 2001
+From a2ce41e91d530459eb35d64a19f714ebfe0d4a20 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 22 Jun 2020 21:35:16 +0000
 Subject: [PATCH] config/eu.am: do not use -Werror
@@ -16,10 +16,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/config/eu.am b/config/eu.am
-index 2c3e457..8fb0411 100644
+index 58cd3c4..ac42390 100644
 --- a/config/eu.am
 +++ b/config/eu.am
-@@ -89,7 +89,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
+@@ -91,7 +91,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
  	    -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \
  	    $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
  	    $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
@@ -27,7 +27,7 @@ index 2c3e457..8fb0411 100644
  	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
  	    $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
  	    $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
-@@ -99,7 +98,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
+@@ -101,7 +100,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
  	   $(TRAMPOLINES_WARNING) \
  	   $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
  	   $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
diff --git a/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch b/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
deleted file mode 100644
index 9509fb4e77..0000000000
--- a/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-glibc 2.34 calls pthread_kill from the raise function. Before raise
-directly called the (tg)kill syscall. So allow pthread_kill to be the
-first frame in a backtrace where raise is expected. Also change some
-asserts to fprintf plus abort to make it more clear why the testcase
-fails.
-
-https://sourceware.org/bugzilla/show_bug.cgi?id=28190
-
-Signed-off-by: Mark Wielaard <mark@klomp.org>
-Upstream-Status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2021q3/004019.html]
----
- tests/ChangeLog   |  6 +++++
- tests/backtrace.c | 62 +++++++++++++++++++++++++++++++++++++++++------
- 2 files changed, 61 insertions(+), 7 deletions(-)
-
-Index: elfutils-0.185/tests/ChangeLog
-===================================================================
---- elfutils-0.185.orig/tests/ChangeLog
-+++ elfutils-0.185/tests/ChangeLog
-@@ -1,3 +1,9 @@
-+2021-08-04  Mark Wielaard  <mark@klomp.org>
-+
-+	PR28190
-+	* backtrace.c (callback_verify): Check for pthread_kill as first
-+	frame. Change asserts to fprintf plus abort.
-+
- 2021-05-14  Frank Ch. Eigler <fche@redhat.com>
- 
- 	PR27859
-Index: elfutils-0.185/tests/backtrace.c
-===================================================================
---- elfutils-0.185.orig/tests/backtrace.c
-+++ elfutils-0.185/tests/backtrace.c
-@@ -97,6 +97,9 @@ callback_verify (pid_t tid, unsigned fra
-   static bool reduce_frameno = false;
-   if (reduce_frameno)
-     frameno--;
-+  static bool pthread_kill_seen = false;
-+  if (pthread_kill_seen)
-+    frameno--;
-   if (! use_raise_jmp_patching && frameno >= 2)
-     frameno += 2;
-   const char *symname2 = NULL;
-@@ -107,11 +110,26 @@ callback_verify (pid_t tid, unsigned fra
- 	       && (strcmp (symname, "__kernel_vsyscall") == 0
- 		   || strcmp (symname, "__libc_do_syscall") == 0))
- 	reduce_frameno = true;
-+      else if (! pthread_kill_seen && symname
-+	       && strstr (symname, "pthread_kill") != NULL)
-+	pthread_kill_seen = true;
-       else
--	assert (symname && strcmp (symname, "raise") == 0);
-+	{
-+	  if (!symname || strcmp (symname, "raise") != 0)
-+	    {
-+	      fprintf (stderr,
-+		       "case 0: expected symname 'raise' got '%s'\n", symname);
-+	      abort ();
-+	    }
-+	}
-       break;
-     case 1:
--      assert (symname != NULL && strcmp (symname, "sigusr2") == 0);
-+      if (symname == NULL || strcmp (symname, "sigusr2") != 0)
-+	{
-+	  fprintf (stderr,
-+		   "case 1: expected symname 'sigusr2' got '%s'\n", symname);
-+	  abort ();
-+	}
-       break;
-     case 2: // x86_64 only
-       /* __restore_rt - glibc maybe does not have to have this symbol.  */
-@@ -120,11 +138,21 @@ callback_verify (pid_t tid, unsigned fra
-       if (use_raise_jmp_patching)
- 	{
- 	  /* Verify we trapped on the very first instruction of jmp.  */
--	  assert (symname != NULL && strcmp (symname, "jmp") == 0);
-+	  if (symname == NULL || strcmp (symname, "jmp") != 0)
-+	    {
-+	      fprintf (stderr,
-+		       "case 3: expected symname 'raise' got '%s'\n", symname);
-+	      abort ();
-+	    }
- 	  mod = dwfl_addrmodule (dwfl, pc - 1);
- 	  if (mod)
- 	    symname2 = dwfl_module_addrname (mod, pc - 1);
--	  assert (symname2 == NULL || strcmp (symname2, "jmp") != 0);
-+	  if (symname2 == NULL || strcmp (symname2, "jmp") != 0)
-+	    {
-+	      fprintf (stderr,
-+		       "case 3: expected symname2 'jmp' got '%s'\n", symname2);
-+	      abort ();
-+	    }
- 	  break;
- 	}
-       FALLTHROUGH;
-@@ -137,11 +165,22 @@ callback_verify (pid_t tid, unsigned fra
- 	  duplicate_sigusr2 = true;
- 	  break;
- 	}
--      assert (symname != NULL && strcmp (symname, "stdarg") == 0);
-+      if (symname == NULL || strcmp (symname, "stdarg") != 0)
-+	{
-+	  fprintf (stderr,
-+		   "case 4: expected symname 'stdarg' got '%s'\n", symname);
-+	  abort ();
-+	}
-       break;
-     case 5:
-       /* Verify we trapped on the very last instruction of child.  */
--      assert (symname != NULL && strcmp (symname, "backtracegen") == 0);
-+      if (symname == NULL || strcmp (symname, "backtracegen") != 0)
-+	{
-+	  fprintf (stderr,
-+		   "case 5: expected symname 'backtracegen' got '%s'\n",
-+		   symname);
-+	  abort ();
-+	}
-       mod = dwfl_addrmodule (dwfl, pc);
-       if (mod)
- 	symname2 = dwfl_module_addrname (mod, pc);
-@@ -151,7 +190,15 @@ callback_verify (pid_t tid, unsigned fra
-       // instructions or even inserts some padding instructions at the end
-       // (which apparently happens on ppc64).
-       if (use_raise_jmp_patching)
--        assert (symname2 == NULL || strcmp (symname2, "backtracegen") != 0);
-+	{
-+          if (symname2 != NULL && strcmp (symname2, "backtracegen") == 0)
-+	    {
-+	      fprintf (stderr,
-+		       "use_raise_jmp_patching didn't expect symname2 "
-+		       "'backtracegen'\n");
-+	      abort ();
-+	    }
-+	}
-       break;
-   }
- }
-- 
2.20.1

Re: [PATCH 22/36] elfutils: update 0.185 -> 0.186

[Khem Raj]

On Wed, Nov 17, 2021 at 7:35 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Drop glibc-2.34-fix.patch merged upstream.
>
> Rework support for error() on non-glibc targets:
> upstream now provides its own implementation, so we can drop
> the patch that adds ours; said implementation isn't
> build-tested with tests, so ptest has to be disabled on musl.

Overall this is an improvement so I am good with this patch.
if upstream implementation does not pass ptests
perhaps worth reporting upstream.

> This, in turns, allows dropping 0004-Fix-error-on-musl.patch.
>
> License-Update: copyright years
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../{elfutils_0.185.bb => elfutils_0.186.bb}  |  12 +-
>  ...ompilation-on-platforms-without-erro.patch |  54 +++++++
>  .../elfutils/files/0002-musl-libs.patch       | 118 ---------------
>  .../elfutils/files/0003-musl-utils.patch      |   6 +-
>  .../files/0004-Fix-error-on-musl.patch        |  36 -----
>  .../0015-config-eu.am-do-not-use-Werror.patch |   8 +-
>  .../elfutils/files/glibc-2.34-fix.patch       | 138 ------------------
>  7 files changed, 65 insertions(+), 307 deletions(-)
>  rename meta/recipes-devtools/elfutils/{elfutils_0.185.bb => elfutils_0.186.bb} (95%)
>  create mode 100644 meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
>  delete mode 100644 meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
>  delete mode 100644 meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
>  delete mode 100644 meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
>
> diff --git a/meta/recipes-devtools/elfutils/elfutils_0.185.bb b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
> similarity index 95%
> rename from meta/recipes-devtools/elfutils/elfutils_0.185.bb
> rename to meta/recipes-devtools/elfutils/elfutils_0.186.bb
> index f4769e3632..b3588a2196 100644
> --- a/meta/recipes-devtools/elfutils/elfutils_0.185.bb
> +++ b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
> @@ -4,7 +4,7 @@ DESCRIPTION = "elfutils is a collection of utilities and libraries to read, crea
>  SECTION = "base"
>  LICENSE = "GPLv2 & GPLv2+ & LGPLv3+ & GPLv3+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> -                    file://debuginfod/debuginfod-client.c;endline=27;md5=f8e9d171c401c493ec45a0b2992ea2ed \
> +                    file://debuginfod/debuginfod-client.c;endline=27;md5=d2adfd8f5347d4c96e3c280393ce66da \
>                      "
>  DEPENDS = "zlib virtual/libintl"
>  DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack "
> @@ -22,20 +22,16 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
>             file://ptest.patch \
>             file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
>             file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \
> -           file://glibc-2.34-fix.patch \
> +           file://0001-debuginfod-fix-compilation-on-platforms-without-erro.patch \
>             "
>  SRC_URI:append:libc-musl = " \
> -           file://0002-musl-libs.patch \
>             file://0003-musl-utils.patch \
> -           file://0004-Fix-error-on-musl.patch \
>             file://0015-config-eu.am-do-not-use-Werror.patch \
>             "
> -SRC_URI[sha256sum] = "dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6"
> -
> -# remove at next version upgrade or when output changes
> -PR = "r1"
> +SRC_URI[sha256sum] = "7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177"
>
>  inherit autotools gettext ptest pkgconfig
> +PTEST_ENABLED:libc-musl = "0"
>
>  EXTRA_OECONF = "--program-prefix=eu-"
>
> diff --git a/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
> new file mode 100644
> index 0000000000..e80d96aaca
> --- /dev/null
> +++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
> @@ -0,0 +1,54 @@
> +From 99617d7ab5b01c322b0f27d4aa0dd91c61793a5e Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
> +Date: Wed, 10 Nov 2021 21:17:48 -0300
> +Subject: [PATCH] debuginfod: fix compilation on platforms without <error.h>
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +"system.h" only declares the error() function, so it needs to be in an
> +'extern "C"' block, otherwise linking fails.
> +
> +Since we are here, use quotes for "system.h" header, since it's a local
> +header, not a system one.
> +
> +Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=90b9e91b961b794a4e58ab76d9191a5e7343584e]
> +Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + debuginfod/ChangeLog      | 4 ++++
> + debuginfod/debuginfod.cxx | 2 +-
> + 2 files changed, 5 insertions(+), 1 deletion(-)
> +
> +diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
> +index f06d3ee..822bd63 100644
> +--- a/debuginfod/ChangeLog
> ++++ b/debuginfod/ChangeLog
> +@@ -1,3 +1,7 @@
> ++2021-11-10  Érico N. Rolim  <erico.erc@gmail.com>
> ++
> ++      * debuginfod.cxx: include "system.h" under 'extern "C"' block.
> ++
> + 2021-11-05  Frank Ch. Eigler  <fche@redhat.com>
> +
> +       PR28430
> +diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
> +index 521cb52..764e7b9 100644
> +--- a/debuginfod/debuginfod.cxx
> ++++ b/debuginfod/debuginfod.cxx
> +@@ -33,11 +33,11 @@
> +
> + extern "C" {
> + #include "printversion.h"
> ++#include "system.h"
> + }
> +
> + #include "debuginfod.h"
> + #include <dwarf.h>
> +-#include <system.h>
> +
> + #include <argp.h>
> + #ifdef __GNUC__
> +--
> +2.20.1
> +
> diff --git a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
> deleted file mode 100644
> index c7360da7a7..0000000000
> --- a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
> +++ /dev/null
> @@ -1,118 +0,0 @@
> -From 0f4667f0bb4b000d74ade07e90bd690b7217a19d Mon Sep 17 00:00:00 2001
> -From: Hongxu Jia <hongxu.jia@windriver.com>
> -Date: Fri, 23 Aug 2019 10:18:47 +0800
> -Subject: [PATCH] musl-libs
> -
> -Collection of fixes needed to compile libelf and other libraries
> -provided by elfutils for musl targets
> -
> -error is glibc specific API, so this patch will mostly not accepted
> -upstream given that elfutils has been closely tied to glibc
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -Upstream-Status: Inappropriate [workaround for musl]
> -
> -Rebase to 0.177
> -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> -
> ----
> - lib/error.h                    | 27 +++++++++++++++++++++++++++
> - lib/fixedsizehash.h            |  1 -
> - lib/libeu.h                    |  1 +
> - libdwfl/linux-kernel-modules.c |  1 +
> - libelf/elf.h                   |  7 +++++++
> - 5 files changed, 36 insertions(+), 1 deletion(-)
> - create mode 100644 lib/error.h
> -
> -diff --git a/lib/error.h b/lib/error.h
> -new file mode 100644
> -index 0000000..ef06827
> ---- /dev/null
> -+++ b/lib/error.h
> -@@ -0,0 +1,27 @@
> -+#ifndef _ERROR_H_
> -+#define _ERROR_H_
> -+
> -+#include <stdarg.h>
> -+#include <stdio.h>
> -+#include <stdlib.h>
> -+#include <string.h>
> -+#include <errno.h>
> -+
> -+static unsigned int error_message_count = 0;
> -+
> -+static inline void error(int status, int errnum, const char* format, ...)
> -+{
> -+      va_list ap;
> -+      fprintf(stderr, "%s: ", program_invocation_name);
> -+      va_start(ap, format);
> -+      vfprintf(stderr, format, ap);
> -+      va_end(ap);
> -+      if (errnum)
> -+              fprintf(stderr, ": %s", strerror(errnum));
> -+      fprintf(stderr, "\n");
> -+      error_message_count++;
> -+      if (status)
> -+              exit(status);
> -+}
> -+
> -+#endif        /* _ERROR_H_ */
> -diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
> -index dac2a5f..43016fc 100644
> ---- a/lib/fixedsizehash.h
> -+++ b/lib/fixedsizehash.h
> -@@ -30,7 +30,6 @@
> - #include <errno.h>
> - #include <stdlib.h>
> - #include <string.h>
> --#include <sys/cdefs.h>
> -
> - #include <system.h>
> -
> -diff --git a/lib/libeu.h b/lib/libeu.h
> -index ecb4d01..edc85e3 100644
> ---- a/lib/libeu.h
> -+++ b/lib/libeu.h
> -@@ -29,6 +29,7 @@
> - #ifndef LIBEU_H
> - #define LIBEU_H
> -
> -+#include "system.h"
> - #include <stddef.h>
> - #include <stdint.h>
> -
> -diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
> -index c0f8dfa..aa78033 100644
> ---- a/libdwfl/linux-kernel-modules.c
> -+++ b/libdwfl/linux-kernel-modules.c
> -@@ -50,6 +50,7 @@
> - #include <sys/utsname.h>
> - #include <fcntl.h>
> - #include <unistd.h>
> -+#include "system.h"
> -
> - /* If fts.h is included before config.h, its indirect inclusions may not
> -    give us the right LFS aliases of these functions, so map them manually.  */
> -diff --git a/libelf/elf.h b/libelf/elf.h
> -index 8e3e618..1353890 100644
> ---- a/libelf/elf.h
> -+++ b/libelf/elf.h
> -@@ -19,6 +19,10 @@
> - #ifndef _ELF_H
> - #define       _ELF_H 1
> -
> -+#ifdef __cplusplus
> -+extern "C" {
> -+#endif
> -+
> - /* Standard ELF types.  */
> -
> - #include <stdint.h>
> -@@ -4102,4 +4106,7 @@ enum
> - #define R_ARC_TLS_LE_S9               0x4a
> - #define R_ARC_TLS_LE_32               0x4b
> -
> -+#ifdef __cplusplus
> -+}
> -+#endif
> - #endif        /* elf.h */
> diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
> index 2e379cdba6..85f8140330 100644
> --- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
> +++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
> @@ -1,4 +1,4 @@
> -From 2f94d488bf3daaa6a8548ee77120fc2506a9bbe3 Mon Sep 17 00:00:00 2001
> +From 934d21dc0b06b95c7c65cb29c5096decd91d4d5f Mon Sep 17 00:00:00 2001
>  From: Hongxu Jia <hongxu.jia@windriver.com>
>  Date: Fri, 23 Aug 2019 10:19:48 +0800
>  Subject: [PATCH] musl-utils
> @@ -57,7 +57,7 @@ index 2c6d91b..608646e 100644
>   ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
>
>  diff --git a/src/strip.c b/src/strip.c
> -index 70fc8c0..d035d9e 100644
> +index d5b753d..d6e1b64 100644
>  --- a/src/strip.c
>  +++ b/src/strip.c
>  @@ -46,6 +46,13 @@
> @@ -75,7 +75,7 @@ index 70fc8c0..d035d9e 100644
>
>   /* Name and version of program.  */
>  diff --git a/src/unstrip.c b/src/unstrip.c
> -index e488e81..0e44456 100644
> +index aacc9aa..5e71290 100644
>  --- a/src/unstrip.c
>  +++ b/src/unstrip.c
>  @@ -52,6 +52,15 @@
> diff --git a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
> deleted file mode 100644
> index 2fa60c333c..0000000000
> --- a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From 72819106d0e5666d172d39c24c19e4e7a3b8be0e Mon Sep 17 00:00:00 2001
> -From: Richard Purdie <richard.purdie@linuxfoundation.org>
> -Date: Wed, 1 May 2019 22:15:03 +0100
> -Subject: [PATCH] Fix error on musl:
> -
> -| ../../elfutils-0.176/tests/elfstrmerge.c: In function 'main':
> -| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: error: 'ALLPERMS' undeclared (first use in this function); did you mean 'EPERM'?
> -|        fdnew = open (fnew, O_WRONLY | O_CREAT, st.st_mode & ALLPERMS);
> -|                                                             ^~~~~~~~
> -|                                                             EPERM
> -| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: note: each undeclared identifier is reported only once for each function it appears in
> -
> -Upstream-Status: Inappropriate [workaround in musl]
> -
> -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> -
> ----
> - tests/elfstrmerge.c | 5 +++++
> - 1 file changed, 5 insertions(+)
> -
> -diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
> -index 197c6a5..3683672 100644
> ---- a/tests/elfstrmerge.c
> -+++ b/tests/elfstrmerge.c
> -@@ -33,6 +33,11 @@
> - #include ELFUTILS_HEADER(dwelf)
> - #include "elf-knowledge.h"
> -
> -+/* for musl */
> -+#ifndef ALLPERMS
> -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
> -+#endif
> -+
> - /* The original ELF file.  */
> - static int fd = -1;
> - static Elf *elf = NULL;
> diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
> index 5cd6fffc27..c96cfd9777 100644
> --- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
> +++ b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
> @@ -1,4 +1,4 @@
> -From cfced441d4a6f2eca51d29c52240275bd6f54e49 Mon Sep 17 00:00:00 2001
> +From a2ce41e91d530459eb35d64a19f714ebfe0d4a20 Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex.kanavin@gmail.com>
>  Date: Mon, 22 Jun 2020 21:35:16 +0000
>  Subject: [PATCH] config/eu.am: do not use -Werror
> @@ -16,10 +16,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>   1 file changed, 2 deletions(-)
>
>  diff --git a/config/eu.am b/config/eu.am
> -index 2c3e457..8fb0411 100644
> +index 58cd3c4..ac42390 100644
>  --- a/config/eu.am
>  +++ b/config/eu.am
> -@@ -89,7 +89,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
> +@@ -91,7 +91,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
>             -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \
>             $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
>             $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
> @@ -27,7 +27,7 @@ index 2c3e457..8fb0411 100644
>             $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
>             $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
>             $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
> -@@ -99,7 +98,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
> +@@ -101,7 +100,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
>            $(TRAMPOLINES_WARNING) \
>            $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
>            $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
> diff --git a/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch b/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
> deleted file mode 100644
> index 9509fb4e77..0000000000
> --- a/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
> +++ /dev/null
> @@ -1,138 +0,0 @@
> -glibc 2.34 calls pthread_kill from the raise function. Before raise
> -directly called the (tg)kill syscall. So allow pthread_kill to be the
> -first frame in a backtrace where raise is expected. Also change some
> -asserts to fprintf plus abort to make it more clear why the testcase
> -fails.
> -
> -https://sourceware.org/bugzilla/show_bug.cgi?id=28190
> -
> -Signed-off-by: Mark Wielaard <mark@klomp.org>
> -Upstream-Status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2021q3/004019.html]
> ----
> - tests/ChangeLog   |  6 +++++
> - tests/backtrace.c | 62 +++++++++++++++++++++++++++++++++++++++++------
> - 2 files changed, 61 insertions(+), 7 deletions(-)
> -
> -Index: elfutils-0.185/tests/ChangeLog
> -===================================================================
> ---- elfutils-0.185.orig/tests/ChangeLog
> -+++ elfutils-0.185/tests/ChangeLog
> -@@ -1,3 +1,9 @@
> -+2021-08-04  Mark Wielaard  <mark@klomp.org>
> -+
> -+      PR28190
> -+      * backtrace.c (callback_verify): Check for pthread_kill as first
> -+      frame. Change asserts to fprintf plus abort.
> -+
> - 2021-05-14  Frank Ch. Eigler <fche@redhat.com>
> -
> -       PR27859
> -Index: elfutils-0.185/tests/backtrace.c
> -===================================================================
> ---- elfutils-0.185.orig/tests/backtrace.c
> -+++ elfutils-0.185/tests/backtrace.c
> -@@ -97,6 +97,9 @@ callback_verify (pid_t tid, unsigned fra
> -   static bool reduce_frameno = false;
> -   if (reduce_frameno)
> -     frameno--;
> -+  static bool pthread_kill_seen = false;
> -+  if (pthread_kill_seen)
> -+    frameno--;
> -   if (! use_raise_jmp_patching && frameno >= 2)
> -     frameno += 2;
> -   const char *symname2 = NULL;
> -@@ -107,11 +110,26 @@ callback_verify (pid_t tid, unsigned fra
> -              && (strcmp (symname, "__kernel_vsyscall") == 0
> -                  || strcmp (symname, "__libc_do_syscall") == 0))
> -       reduce_frameno = true;
> -+      else if (! pthread_kill_seen && symname
> -+             && strstr (symname, "pthread_kill") != NULL)
> -+      pthread_kill_seen = true;
> -       else
> --      assert (symname && strcmp (symname, "raise") == 0);
> -+      {
> -+        if (!symname || strcmp (symname, "raise") != 0)
> -+          {
> -+            fprintf (stderr,
> -+                     "case 0: expected symname 'raise' got '%s'\n", symname);
> -+            abort ();
> -+          }
> -+      }
> -       break;
> -     case 1:
> --      assert (symname != NULL && strcmp (symname, "sigusr2") == 0);
> -+      if (symname == NULL || strcmp (symname, "sigusr2") != 0)
> -+      {
> -+        fprintf (stderr,
> -+                 "case 1: expected symname 'sigusr2' got '%s'\n", symname);
> -+        abort ();
> -+      }
> -       break;
> -     case 2: // x86_64 only
> -       /* __restore_rt - glibc maybe does not have to have this symbol.  */
> -@@ -120,11 +138,21 @@ callback_verify (pid_t tid, unsigned fra
> -       if (use_raise_jmp_patching)
> -       {
> -         /* Verify we trapped on the very first instruction of jmp.  */
> --        assert (symname != NULL && strcmp (symname, "jmp") == 0);
> -+        if (symname == NULL || strcmp (symname, "jmp") != 0)
> -+          {
> -+            fprintf (stderr,
> -+                     "case 3: expected symname 'raise' got '%s'\n", symname);
> -+            abort ();
> -+          }
> -         mod = dwfl_addrmodule (dwfl, pc - 1);
> -         if (mod)
> -           symname2 = dwfl_module_addrname (mod, pc - 1);
> --        assert (symname2 == NULL || strcmp (symname2, "jmp") != 0);
> -+        if (symname2 == NULL || strcmp (symname2, "jmp") != 0)
> -+          {
> -+            fprintf (stderr,
> -+                     "case 3: expected symname2 'jmp' got '%s'\n", symname2);
> -+            abort ();
> -+          }
> -         break;
> -       }
> -       FALLTHROUGH;
> -@@ -137,11 +165,22 @@ callback_verify (pid_t tid, unsigned fra
> -         duplicate_sigusr2 = true;
> -         break;
> -       }
> --      assert (symname != NULL && strcmp (symname, "stdarg") == 0);
> -+      if (symname == NULL || strcmp (symname, "stdarg") != 0)
> -+      {
> -+        fprintf (stderr,
> -+                 "case 4: expected symname 'stdarg' got '%s'\n", symname);
> -+        abort ();
> -+      }
> -       break;
> -     case 5:
> -       /* Verify we trapped on the very last instruction of child.  */
> --      assert (symname != NULL && strcmp (symname, "backtracegen") == 0);
> -+      if (symname == NULL || strcmp (symname, "backtracegen") != 0)
> -+      {
> -+        fprintf (stderr,
> -+                 "case 5: expected symname 'backtracegen' got '%s'\n",
> -+                 symname);
> -+        abort ();
> -+      }
> -       mod = dwfl_addrmodule (dwfl, pc);
> -       if (mod)
> -       symname2 = dwfl_module_addrname (mod, pc);
> -@@ -151,7 +190,15 @@ callback_verify (pid_t tid, unsigned fra
> -       // instructions or even inserts some padding instructions at the end
> -       // (which apparently happens on ppc64).
> -       if (use_raise_jmp_patching)
> --        assert (symname2 == NULL || strcmp (symname2, "backtracegen") != 0);
> -+      {
> -+          if (symname2 != NULL && strcmp (symname2, "backtracegen") == 0)
> -+          {
> -+            fprintf (stderr,
> -+                     "use_raise_jmp_patching didn't expect symname2 "
> -+                     "'backtracegen'\n");
> -+            abort ();
> -+          }
> -+      }
> -       break;
> -   }
> - }
> --
> 2.20.1
>

Re: [PATCH 22/36] elfutils: update 0.185 -> 0.186

[Alexander Kanavin]

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

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

> > Rework support for error() on non-glibc targets:
> > upstream now provides its own implementation, so we can drop
> > the patch that adds ours; said implementation isn't
> > build-tested with tests, so ptest has to be disabled on musl.
>
> Overall this is an improvement so I am good with this patch.
> if upstream implementation does not pass ptests
> perhaps worth reporting upstream.
>

I would if upstream would be interested in tests with anything except
glibc, but I'm fairly sure they're not. The tests don't even build with
musl without invasive patching.

Alex



>
> > This, in turns, allows dropping 0004-Fix-error-on-musl.patch.
> >
> > License-Update: copyright years
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  .../{elfutils_0.185.bb => elfutils_0.186.bb}  |  12 +-
> >  ...ompilation-on-platforms-without-erro.patch |  54 +++++++
> >  .../elfutils/files/0002-musl-libs.patch       | 118 ---------------
> >  .../elfutils/files/0003-musl-utils.patch      |   6 +-
> >  .../files/0004-Fix-error-on-musl.patch        |  36 -----
> >  .../0015-config-eu.am-do-not-use-Werror.patch |   8 +-
> >  .../elfutils/files/glibc-2.34-fix.patch       | 138 ------------------
> >  7 files changed, 65 insertions(+), 307 deletions(-)
> >  rename meta/recipes-devtools/elfutils/{elfutils_0.185.bb =>
> elfutils_0.186.bb} (95%)
> >  create mode 100644
> meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
> >  delete mode 100644
> meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
> >  delete mode 100644
> meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
> >  delete mode 100644
> meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
> >
> > diff --git a/meta/recipes-devtools/elfutils/elfutils_0.185.bb
> b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
> > similarity index 95%
> > rename from meta/recipes-devtools/elfutils/elfutils_0.185.bb
> > rename to meta/recipes-devtools/elfutils/elfutils_0.186.bb
> > index f4769e3632..b3588a2196 100644
> > --- a/meta/recipes-devtools/elfutils/elfutils_0.185.bb
> > +++ b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
> > @@ -4,7 +4,7 @@ DESCRIPTION = "elfutils is a collection of utilities and
> libraries to read, crea
> >  SECTION = "base"
> >  LICENSE = "GPLv2 & GPLv2+ & LGPLv3+ & GPLv3+"
> >  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504
> \
> > -
> file://debuginfod/debuginfod-client.c;endline=27;md5=f8e9d171c401c493ec45a0b2992ea2ed
> \
> > +
> file://debuginfod/debuginfod-client.c;endline=27;md5=d2adfd8f5347d4c96e3c280393ce66da
> \
> >                      "
> >  DEPENDS = "zlib virtual/libintl"
> >  DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack "
> > @@ -22,20 +22,16 @@ SRC_URI = "
> https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
> >             file://ptest.patch \
> >
>  file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
> >
>  file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \
> > -           file://glibc-2.34-fix.patch \
> > +
>  file://0001-debuginfod-fix-compilation-on-platforms-without-erro.patch \
> >             "
> >  SRC_URI:append:libc-musl = " \
> > -           file://0002-musl-libs.patch \
> >             file://0003-musl-utils.patch \
> > -           file://0004-Fix-error-on-musl.patch \
> >             file://0015-config-eu.am-do-not-use-Werror.patch \
> >             "
> > -SRC_URI[sha256sum] =
> "dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6"
> > -
> > -# remove at next version upgrade or when output changes
> > -PR = "r1"
> > +SRC_URI[sha256sum] =
> "7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177"
> >
> >  inherit autotools gettext ptest pkgconfig
> > +PTEST_ENABLED:libc-musl = "0"
> >
> >  EXTRA_OECONF = "--program-prefix=eu-"
> >
> > diff --git
> a/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
> b/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
> > new file mode 100644
> > index 0000000000..e80d96aaca
> > --- /dev/null
> > +++
> b/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
> > @@ -0,0 +1,54 @@
> > +From 99617d7ab5b01c322b0f27d4aa0dd91c61793a5e Mon Sep 17 00:00:00 2001
> > +From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
> > +Date: Wed, 10 Nov 2021 21:17:48 -0300
> > +Subject: [PATCH] debuginfod: fix compilation on platforms without
> <error.h>
> > +MIME-Version: 1.0
> > +Content-Type: text/plain; charset=UTF-8
> > +Content-Transfer-Encoding: 8bit
> > +
> > +"system.h" only declares the error() function, so it needs to be in an
> > +'extern "C"' block, otherwise linking fails.
> > +
> > +Since we are here, use quotes for "system.h" header, since it's a local
> > +header, not a system one.
> > +
> > +Upstream-Status: Backport [
> https://sourceware.org/git/?p=elfutils.git;a=commit;h=90b9e91b961b794a4e58ab76d9191a5e7343584e
> ]
> > +Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
> > +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > +---
> > + debuginfod/ChangeLog      | 4 ++++
> > + debuginfod/debuginfod.cxx | 2 +-
> > + 2 files changed, 5 insertions(+), 1 deletion(-)
> > +
> > +diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
> > +index f06d3ee..822bd63 100644
> > +--- a/debuginfod/ChangeLog
> > ++++ b/debuginfod/ChangeLog
> > +@@ -1,3 +1,7 @@
> > ++2021-11-10  Érico N. Rolim  <erico.erc@gmail.com>
> > ++
> > ++      * debuginfod.cxx: include "system.h" under 'extern "C"' block.
> > ++
> > + 2021-11-05  Frank Ch. Eigler  <fche@redhat.com>
> > +
> > +       PR28430
> > +diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
> > +index 521cb52..764e7b9 100644
> > +--- a/debuginfod/debuginfod.cxx
> > ++++ b/debuginfod/debuginfod.cxx
> > +@@ -33,11 +33,11 @@
> > +
> > + extern "C" {
> > + #include "printversion.h"
> > ++#include "system.h"
> > + }
> > +
> > + #include "debuginfod.h"
> > + #include <dwarf.h>
> > +-#include <system.h>
> > +
> > + #include <argp.h>
> > + #ifdef __GNUC__
> > +--
> > +2.20.1
> > +
> > diff --git a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
> b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
> > deleted file mode 100644
> > index c7360da7a7..0000000000
> > --- a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
> > +++ /dev/null
> > @@ -1,118 +0,0 @@
> > -From 0f4667f0bb4b000d74ade07e90bd690b7217a19d Mon Sep 17 00:00:00 2001
> > -From: Hongxu Jia <hongxu.jia@windriver.com>
> > -Date: Fri, 23 Aug 2019 10:18:47 +0800
> > -Subject: [PATCH] musl-libs
> > -
> > -Collection of fixes needed to compile libelf and other libraries
> > -provided by elfutils for musl targets
> > -
> > -error is glibc specific API, so this patch will mostly not accepted
> > -upstream given that elfutils has been closely tied to glibc
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > -Upstream-Status: Inappropriate [workaround for musl]
> > -
> > -Rebase to 0.177
> > -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> > -
> > ----
> > - lib/error.h                    | 27 +++++++++++++++++++++++++++
> > - lib/fixedsizehash.h            |  1 -
> > - lib/libeu.h                    |  1 +
> > - libdwfl/linux-kernel-modules.c |  1 +
> > - libelf/elf.h                   |  7 +++++++
> > - 5 files changed, 36 insertions(+), 1 deletion(-)
> > - create mode 100644 lib/error.h
> > -
> > -diff --git a/lib/error.h b/lib/error.h
> > -new file mode 100644
> > -index 0000000..ef06827
> > ---- /dev/null
> > -+++ b/lib/error.h
> > -@@ -0,0 +1,27 @@
> > -+#ifndef _ERROR_H_
> > -+#define _ERROR_H_
> > -+
> > -+#include <stdarg.h>
> > -+#include <stdio.h>
> > -+#include <stdlib.h>
> > -+#include <string.h>
> > -+#include <errno.h>
> > -+
> > -+static unsigned int error_message_count = 0;
> > -+
> > -+static inline void error(int status, int errnum, const char* format,
> ...)
> > -+{
> > -+      va_list ap;
> > -+      fprintf(stderr, "%s: ", program_invocation_name);
> > -+      va_start(ap, format);
> > -+      vfprintf(stderr, format, ap);
> > -+      va_end(ap);
> > -+      if (errnum)
> > -+              fprintf(stderr, ": %s", strerror(errnum));
> > -+      fprintf(stderr, "\n");
> > -+      error_message_count++;
> > -+      if (status)
> > -+              exit(status);
> > -+}
> > -+
> > -+#endif        /* _ERROR_H_ */
> > -diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
> > -index dac2a5f..43016fc 100644
> > ---- a/lib/fixedsizehash.h
> > -+++ b/lib/fixedsizehash.h
> > -@@ -30,7 +30,6 @@
> > - #include <errno.h>
> > - #include <stdlib.h>
> > - #include <string.h>
> > --#include <sys/cdefs.h>
> > -
> > - #include <system.h>
> > -
> > -diff --git a/lib/libeu.h b/lib/libeu.h
> > -index ecb4d01..edc85e3 100644
> > ---- a/lib/libeu.h
> > -+++ b/lib/libeu.h
> > -@@ -29,6 +29,7 @@
> > - #ifndef LIBEU_H
> > - #define LIBEU_H
> > -
> > -+#include "system.h"
> > - #include <stddef.h>
> > - #include <stdint.h>
> > -
> > -diff --git a/libdwfl/linux-kernel-modules.c
> b/libdwfl/linux-kernel-modules.c
> > -index c0f8dfa..aa78033 100644
> > ---- a/libdwfl/linux-kernel-modules.c
> > -+++ b/libdwfl/linux-kernel-modules.c
> > -@@ -50,6 +50,7 @@
> > - #include <sys/utsname.h>
> > - #include <fcntl.h>
> > - #include <unistd.h>
> > -+#include "system.h"
> > -
> > - /* If fts.h is included before config.h, its indirect inclusions may
> not
> > -    give us the right LFS aliases of these functions, so map them
> manually.  */
> > -diff --git a/libelf/elf.h b/libelf/elf.h
> > -index 8e3e618..1353890 100644
> > ---- a/libelf/elf.h
> > -+++ b/libelf/elf.h
> > -@@ -19,6 +19,10 @@
> > - #ifndef _ELF_H
> > - #define       _ELF_H 1
> > -
> > -+#ifdef __cplusplus
> > -+extern "C" {
> > -+#endif
> > -+
> > - /* Standard ELF types.  */
> > -
> > - #include <stdint.h>
> > -@@ -4102,4 +4106,7 @@ enum
> > - #define R_ARC_TLS_LE_S9               0x4a
> > - #define R_ARC_TLS_LE_32               0x4b
> > -
> > -+#ifdef __cplusplus
> > -+}
> > -+#endif
> > - #endif        /* elf.h */
> > diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
> b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
> > index 2e379cdba6..85f8140330 100644
> > --- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
> > +++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
> > @@ -1,4 +1,4 @@
> > -From 2f94d488bf3daaa6a8548ee77120fc2506a9bbe3 Mon Sep 17 00:00:00 2001
> > +From 934d21dc0b06b95c7c65cb29c5096decd91d4d5f Mon Sep 17 00:00:00 2001
> >  From: Hongxu Jia <hongxu.jia@windriver.com>
> >  Date: Fri, 23 Aug 2019 10:19:48 +0800
> >  Subject: [PATCH] musl-utils
> > @@ -57,7 +57,7 @@ index 2c6d91b..608646e 100644
> >   ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
> >
> >  diff --git a/src/strip.c b/src/strip.c
> > -index 70fc8c0..d035d9e 100644
> > +index d5b753d..d6e1b64 100644
> >  --- a/src/strip.c
> >  +++ b/src/strip.c
> >  @@ -46,6 +46,13 @@
> > @@ -75,7 +75,7 @@ index 70fc8c0..d035d9e 100644
> >
> >   /* Name and version of program.  */
> >  diff --git a/src/unstrip.c b/src/unstrip.c
> > -index e488e81..0e44456 100644
> > +index aacc9aa..5e71290 100644
> >  --- a/src/unstrip.c
> >  +++ b/src/unstrip.c
> >  @@ -52,6 +52,15 @@
> > diff --git
> a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
> b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
> > deleted file mode 100644
> > index 2fa60c333c..0000000000
> > --- a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
> > +++ /dev/null
> > @@ -1,36 +0,0 @@
> > -From 72819106d0e5666d172d39c24c19e4e7a3b8be0e Mon Sep 17 00:00:00 2001
> > -From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > -Date: Wed, 1 May 2019 22:15:03 +0100
> > -Subject: [PATCH] Fix error on musl:
> > -
> > -| ../../elfutils-0.176/tests/elfstrmerge.c: In function 'main':
> > -| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: error: 'ALLPERMS'
> undeclared (first use in this function); did you mean 'EPERM'?
> > -|        fdnew = open (fnew, O_WRONLY | O_CREAT, st.st_mode & ALLPERMS);
> > -|                                                             ^~~~~~~~
> > -|                                                             EPERM
> > -| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: note: each
> undeclared identifier is reported only once for each function it appears in
> > -
> > -Upstream-Status: Inappropriate [workaround in musl]
> > -
> > -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > -
> > ----
> > - tests/elfstrmerge.c | 5 +++++
> > - 1 file changed, 5 insertions(+)
> > -
> > -diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
> > -index 197c6a5..3683672 100644
> > ---- a/tests/elfstrmerge.c
> > -+++ b/tests/elfstrmerge.c
> > -@@ -33,6 +33,11 @@
> > - #include ELFUTILS_HEADER(dwelf)
> > - #include "elf-knowledge.h"
> > -
> > -+/* for musl */
> > -+#ifndef ALLPERMS
> > -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/*
> 07777 */
> > -+#endif
> > -+
> > - /* The original ELF file.  */
> > - static int fd = -1;
> > - static Elf *elf = NULL;
> > diff --git
> a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
> b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
> > index 5cd6fffc27..c96cfd9777 100644
> > ---
> a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
> > +++
> b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
> > @@ -1,4 +1,4 @@
> > -From cfced441d4a6f2eca51d29c52240275bd6f54e49 Mon Sep 17 00:00:00 2001
> > +From a2ce41e91d530459eb35d64a19f714ebfe0d4a20 Mon Sep 17 00:00:00 2001
> >  From: Alexander Kanavin <alex.kanavin@gmail.com>
> >  Date: Mon, 22 Jun 2020 21:35:16 +0000
> >  Subject: [PATCH] config/eu.am: do not use -Werror
> > @@ -16,10 +16,10 @@ Signed-off-by: Alexander Kanavin <
> alex.kanavin@gmail.com>
> >   1 file changed, 2 deletions(-)
> >
> >  diff --git a/config/eu.am b/config/eu.am
> > -index 2c3e457..8fb0411 100644
> > +index 58cd3c4..ac42390 100644
> >  --- a/config/eu.am
> >  +++ b/config/eu.am
> > -@@ -89,7 +89,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
> > +@@ -91,7 +91,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
> >             -Wold-style-definition -Wstrict-prototypes
> $(TRAMPOLINES_WARNING) \
> >             $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
> >             $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
> > @@ -27,7 +27,7 @@ index 2c3e457..8fb0411 100644
> >             $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
> >             $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
> >             $(if
> $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
> > -@@ -99,7 +98,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
> > +@@ -101,7 +100,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
> >            $(TRAMPOLINES_WARNING) \
> >            $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
> >            $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
> > diff --git a/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
> b/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
> > deleted file mode 100644
> > index 9509fb4e77..0000000000
> > --- a/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
> > +++ /dev/null
> > @@ -1,138 +0,0 @@
> > -glibc 2.34 calls pthread_kill from the raise function. Before raise
> > -directly called the (tg)kill syscall. So allow pthread_kill to be the
> > -first frame in a backtrace where raise is expected. Also change some
> > -asserts to fprintf plus abort to make it more clear why the testcase
> > -fails.
> > -
> > -https://sourceware.org/bugzilla/show_bug.cgi?id=28190
> > -
> > -Signed-off-by: Mark Wielaard <mark@klomp.org>
> > -Upstream-Status: Submitted [
> https://sourceware.org/pipermail/elfutils-devel/2021q3/004019.html]
> > ----
> > - tests/ChangeLog   |  6 +++++
> > - tests/backtrace.c | 62 +++++++++++++++++++++++++++++++++++++++++------
> > - 2 files changed, 61 insertions(+), 7 deletions(-)
> > -
> > -Index: elfutils-0.185/tests/ChangeLog
> > -===================================================================
> > ---- elfutils-0.185.orig/tests/ChangeLog
> > -+++ elfutils-0.185/tests/ChangeLog
> > -@@ -1,3 +1,9 @@
> > -+2021-08-04  Mark Wielaard  <mark@klomp.org>
> > -+
> > -+      PR28190
> > -+      * backtrace.c (callback_verify): Check for pthread_kill as first
> > -+      frame. Change asserts to fprintf plus abort.
> > -+
> > - 2021-05-14  Frank Ch. Eigler <fche@redhat.com>
> > -
> > -       PR27859
> > -Index: elfutils-0.185/tests/backtrace.c
> > -===================================================================
> > ---- elfutils-0.185.orig/tests/backtrace.c
> > -+++ elfutils-0.185/tests/backtrace.c
> > -@@ -97,6 +97,9 @@ callback_verify (pid_t tid, unsigned fra
> > -   static bool reduce_frameno = false;
> > -   if (reduce_frameno)
> > -     frameno--;
> > -+  static bool pthread_kill_seen = false;
> > -+  if (pthread_kill_seen)
> > -+    frameno--;
> > -   if (! use_raise_jmp_patching && frameno >= 2)
> > -     frameno += 2;
> > -   const char *symname2 = NULL;
> > -@@ -107,11 +110,26 @@ callback_verify (pid_t tid, unsigned fra
> > -              && (strcmp (symname, "__kernel_vsyscall") == 0
> > -                  || strcmp (symname, "__libc_do_syscall") == 0))
> > -       reduce_frameno = true;
> > -+      else if (! pthread_kill_seen && symname
> > -+             && strstr (symname, "pthread_kill") != NULL)
> > -+      pthread_kill_seen = true;
> > -       else
> > --      assert (symname && strcmp (symname, "raise") == 0);
> > -+      {
> > -+        if (!symname || strcmp (symname, "raise") != 0)
> > -+          {
> > -+            fprintf (stderr,
> > -+                     "case 0: expected symname 'raise' got '%s'\n",
> symname);
> > -+            abort ();
> > -+          }
> > -+      }
> > -       break;
> > -     case 1:
> > --      assert (symname != NULL && strcmp (symname, "sigusr2") == 0);
> > -+      if (symname == NULL || strcmp (symname, "sigusr2") != 0)
> > -+      {
> > -+        fprintf (stderr,
> > -+                 "case 1: expected symname 'sigusr2' got '%s'\n",
> symname);
> > -+        abort ();
> > -+      }
> > -       break;
> > -     case 2: // x86_64 only
> > -       /* __restore_rt - glibc maybe does not have to have this
> symbol.  */
> > -@@ -120,11 +138,21 @@ callback_verify (pid_t tid, unsigned fra
> > -       if (use_raise_jmp_patching)
> > -       {
> > -         /* Verify we trapped on the very first instruction of jmp.  */
> > --        assert (symname != NULL && strcmp (symname, "jmp") == 0);
> > -+        if (symname == NULL || strcmp (symname, "jmp") != 0)
> > -+          {
> > -+            fprintf (stderr,
> > -+                     "case 3: expected symname 'raise' got '%s'\n",
> symname);
> > -+            abort ();
> > -+          }
> > -         mod = dwfl_addrmodule (dwfl, pc - 1);
> > -         if (mod)
> > -           symname2 = dwfl_module_addrname (mod, pc - 1);
> > --        assert (symname2 == NULL || strcmp (symname2, "jmp") != 0);
> > -+        if (symname2 == NULL || strcmp (symname2, "jmp") != 0)
> > -+          {
> > -+            fprintf (stderr,
> > -+                     "case 3: expected symname2 'jmp' got '%s'\n",
> symname2);
> > -+            abort ();
> > -+          }
> > -         break;
> > -       }
> > -       FALLTHROUGH;
> > -@@ -137,11 +165,22 @@ callback_verify (pid_t tid, unsigned fra
> > -         duplicate_sigusr2 = true;
> > -         break;
> > -       }
> > --      assert (symname != NULL && strcmp (symname, "stdarg") == 0);
> > -+      if (symname == NULL || strcmp (symname, "stdarg") != 0)
> > -+      {
> > -+        fprintf (stderr,
> > -+                 "case 4: expected symname 'stdarg' got '%s'\n",
> symname);
> > -+        abort ();
> > -+      }
> > -       break;
> > -     case 5:
> > -       /* Verify we trapped on the very last instruction of child.  */
> > --      assert (symname != NULL && strcmp (symname, "backtracegen") ==
> 0);
> > -+      if (symname == NULL || strcmp (symname, "backtracegen") != 0)
> > -+      {
> > -+        fprintf (stderr,
> > -+                 "case 5: expected symname 'backtracegen' got '%s'\n",
> > -+                 symname);
> > -+        abort ();
> > -+      }
> > -       mod = dwfl_addrmodule (dwfl, pc);
> > -       if (mod)
> > -       symname2 = dwfl_module_addrname (mod, pc);
> > -@@ -151,7 +190,15 @@ callback_verify (pid_t tid, unsigned fra
> > -       // instructions or even inserts some padding instructions at the
> end
> > -       // (which apparently happens on ppc64).
> > -       if (use_raise_jmp_patching)
> > --        assert (symname2 == NULL || strcmp (symname2, "backtracegen")
> != 0);
> > -+      {
> > -+          if (symname2 != NULL && strcmp (symname2, "backtracegen") ==
> 0)
> > -+          {
> > -+            fprintf (stderr,
> > -+                     "use_raise_jmp_patching didn't expect symname2 "
> > -+                     "'backtracegen'\n");
> > -+            abort ();
> > -+          }
> > -+      }
> > -       break;
> > -   }
> > - }
> > --
> > 2.20.1
> >
>

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

Re: [PATCH 22/36] elfutils: update 0.185 -> 0.186

[Khem Raj]

On Wed, Nov 17, 2021 at 9:32 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> On Wed, 17 Nov 2021 at 18:15, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> > Rework support for error() on non-glibc targets:
>> > upstream now provides its own implementation, so we can drop
>> > the patch that adds ours; said implementation isn't
>> > build-tested with tests, so ptest has to be disabled on musl.
>>
>> Overall this is an improvement so I am good with this patch.
>> if upstream implementation does not pass ptests
>> perhaps worth reporting upstream.
>
>
> I would if upstream would be interested in tests with anything except glibc, but I'm fairly sure they're not. The tests don't even build with musl without invasive patching.
>

thats fine, there is enough folks who will come around and fix it
perhaps from alpine and other places.

> Alex
>
>
>>
>>
>> > This, in turns, allows dropping 0004-Fix-error-on-musl.patch.
>> >
>> > License-Update: copyright years
>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > ---
>> >  .../{elfutils_0.185.bb => elfutils_0.186.bb}  |  12 +-
>> >  ...ompilation-on-platforms-without-erro.patch |  54 +++++++
>> >  .../elfutils/files/0002-musl-libs.patch       | 118 ---------------
>> >  .../elfutils/files/0003-musl-utils.patch      |   6 +-
>> >  .../files/0004-Fix-error-on-musl.patch        |  36 -----
>> >  .../0015-config-eu.am-do-not-use-Werror.patch |   8 +-
>> >  .../elfutils/files/glibc-2.34-fix.patch       | 138 ------------------
>> >  7 files changed, 65 insertions(+), 307 deletions(-)
>> >  rename meta/recipes-devtools/elfutils/{elfutils_0.185.bb => elfutils_0.186.bb} (95%)
>> >  create mode 100644 meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
>> >  delete mode 100644 meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
>> >  delete mode 100644 meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
>> >  delete mode 100644 meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
>> >
>> > diff --git a/meta/recipes-devtools/elfutils/elfutils_0.185.bb b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
>> > similarity index 95%
>> > rename from meta/recipes-devtools/elfutils/elfutils_0.185.bb
>> > rename to meta/recipes-devtools/elfutils/elfutils_0.186.bb
>> > index f4769e3632..b3588a2196 100644
>> > --- a/meta/recipes-devtools/elfutils/elfutils_0.185.bb
>> > +++ b/meta/recipes-devtools/elfutils/elfutils_0.186.bb
>> > @@ -4,7 +4,7 @@ DESCRIPTION = "elfutils is a collection of utilities and libraries to read, crea
>> >  SECTION = "base"
>> >  LICENSE = "GPLv2 & GPLv2+ & LGPLv3+ & GPLv3+"
>> >  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
>> > -                    file://debuginfod/debuginfod-client.c;endline=27;md5=f8e9d171c401c493ec45a0b2992ea2ed \
>> > +                    file://debuginfod/debuginfod-client.c;endline=27;md5=d2adfd8f5347d4c96e3c280393ce66da \
>> >                      "
>> >  DEPENDS = "zlib virtual/libintl"
>> >  DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack "
>> > @@ -22,20 +22,16 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
>> >             file://ptest.patch \
>> >             file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
>> >             file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \
>> > -           file://glibc-2.34-fix.patch \
>> > +           file://0001-debuginfod-fix-compilation-on-platforms-without-erro.patch \
>> >             "
>> >  SRC_URI:append:libc-musl = " \
>> > -           file://0002-musl-libs.patch \
>> >             file://0003-musl-utils.patch \
>> > -           file://0004-Fix-error-on-musl.patch \
>> >             file://0015-config-eu.am-do-not-use-Werror.patch \
>> >             "
>> > -SRC_URI[sha256sum] = "dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6"
>> > -
>> > -# remove at next version upgrade or when output changes
>> > -PR = "r1"
>> > +SRC_URI[sha256sum] = "7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177"
>> >
>> >  inherit autotools gettext ptest pkgconfig
>> > +PTEST_ENABLED:libc-musl = "0"
>> >
>> >  EXTRA_OECONF = "--program-prefix=eu-"
>> >
>> > diff --git a/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
>> > new file mode 100644
>> > index 0000000000..e80d96aaca
>> > --- /dev/null
>> > +++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
>> > @@ -0,0 +1,54 @@
>> > +From 99617d7ab5b01c322b0f27d4aa0dd91c61793a5e Mon Sep 17 00:00:00 2001
>> > +From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
>> > +Date: Wed, 10 Nov 2021 21:17:48 -0300
>> > +Subject: [PATCH] debuginfod: fix compilation on platforms without <error.h>
>> > +MIME-Version: 1.0
>> > +Content-Type: text/plain; charset=UTF-8
>> > +Content-Transfer-Encoding: 8bit
>> > +
>> > +"system.h" only declares the error() function, so it needs to be in an
>> > +'extern "C"' block, otherwise linking fails.
>> > +
>> > +Since we are here, use quotes for "system.h" header, since it's a local
>> > +header, not a system one.
>> > +
>> > +Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=90b9e91b961b794a4e58ab76d9191a5e7343584e]
>> > +Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
>> > +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > +---
>> > + debuginfod/ChangeLog      | 4 ++++
>> > + debuginfod/debuginfod.cxx | 2 +-
>> > + 2 files changed, 5 insertions(+), 1 deletion(-)
>> > +
>> > +diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
>> > +index f06d3ee..822bd63 100644
>> > +--- a/debuginfod/ChangeLog
>> > ++++ b/debuginfod/ChangeLog
>> > +@@ -1,3 +1,7 @@
>> > ++2021-11-10  Érico N. Rolim  <erico.erc@gmail.com>
>> > ++
>> > ++      * debuginfod.cxx: include "system.h" under 'extern "C"' block.
>> > ++
>> > + 2021-11-05  Frank Ch. Eigler  <fche@redhat.com>
>> > +
>> > +       PR28430
>> > +diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
>> > +index 521cb52..764e7b9 100644
>> > +--- a/debuginfod/debuginfod.cxx
>> > ++++ b/debuginfod/debuginfod.cxx
>> > +@@ -33,11 +33,11 @@
>> > +
>> > + extern "C" {
>> > + #include "printversion.h"
>> > ++#include "system.h"
>> > + }
>> > +
>> > + #include "debuginfod.h"
>> > + #include <dwarf.h>
>> > +-#include <system.h>
>> > +
>> > + #include <argp.h>
>> > + #ifdef __GNUC__
>> > +--
>> > +2.20.1
>> > +
>> > diff --git a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
>> > deleted file mode 100644
>> > index c7360da7a7..0000000000
>> > --- a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
>> > +++ /dev/null
>> > @@ -1,118 +0,0 @@
>> > -From 0f4667f0bb4b000d74ade07e90bd690b7217a19d Mon Sep 17 00:00:00 2001
>> > -From: Hongxu Jia <hongxu.jia@windriver.com>
>> > -Date: Fri, 23 Aug 2019 10:18:47 +0800
>> > -Subject: [PATCH] musl-libs
>> > -
>> > -Collection of fixes needed to compile libelf and other libraries
>> > -provided by elfutils for musl targets
>> > -
>> > -error is glibc specific API, so this patch will mostly not accepted
>> > -upstream given that elfutils has been closely tied to glibc
>> > -
>> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> > -Upstream-Status: Inappropriate [workaround for musl]
>> > -
>> > -Rebase to 0.177
>> > -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> > -
>> > ----
>> > - lib/error.h                    | 27 +++++++++++++++++++++++++++
>> > - lib/fixedsizehash.h            |  1 -
>> > - lib/libeu.h                    |  1 +
>> > - libdwfl/linux-kernel-modules.c |  1 +
>> > - libelf/elf.h                   |  7 +++++++
>> > - 5 files changed, 36 insertions(+), 1 deletion(-)
>> > - create mode 100644 lib/error.h
>> > -
>> > -diff --git a/lib/error.h b/lib/error.h
>> > -new file mode 100644
>> > -index 0000000..ef06827
>> > ---- /dev/null
>> > -+++ b/lib/error.h
>> > -@@ -0,0 +1,27 @@
>> > -+#ifndef _ERROR_H_
>> > -+#define _ERROR_H_
>> > -+
>> > -+#include <stdarg.h>
>> > -+#include <stdio.h>
>> > -+#include <stdlib.h>
>> > -+#include <string.h>
>> > -+#include <errno.h>
>> > -+
>> > -+static unsigned int error_message_count = 0;
>> > -+
>> > -+static inline void error(int status, int errnum, const char* format, ...)
>> > -+{
>> > -+      va_list ap;
>> > -+      fprintf(stderr, "%s: ", program_invocation_name);
>> > -+      va_start(ap, format);
>> > -+      vfprintf(stderr, format, ap);
>> > -+      va_end(ap);
>> > -+      if (errnum)
>> > -+              fprintf(stderr, ": %s", strerror(errnum));
>> > -+      fprintf(stderr, "\n");
>> > -+      error_message_count++;
>> > -+      if (status)
>> > -+              exit(status);
>> > -+}
>> > -+
>> > -+#endif        /* _ERROR_H_ */
>> > -diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
>> > -index dac2a5f..43016fc 100644
>> > ---- a/lib/fixedsizehash.h
>> > -+++ b/lib/fixedsizehash.h
>> > -@@ -30,7 +30,6 @@
>> > - #include <errno.h>
>> > - #include <stdlib.h>
>> > - #include <string.h>
>> > --#include <sys/cdefs.h>
>> > -
>> > - #include <system.h>
>> > -
>> > -diff --git a/lib/libeu.h b/lib/libeu.h
>> > -index ecb4d01..edc85e3 100644
>> > ---- a/lib/libeu.h
>> > -+++ b/lib/libeu.h
>> > -@@ -29,6 +29,7 @@
>> > - #ifndef LIBEU_H
>> > - #define LIBEU_H
>> > -
>> > -+#include "system.h"
>> > - #include <stddef.h>
>> > - #include <stdint.h>
>> > -
>> > -diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
>> > -index c0f8dfa..aa78033 100644
>> > ---- a/libdwfl/linux-kernel-modules.c
>> > -+++ b/libdwfl/linux-kernel-modules.c
>> > -@@ -50,6 +50,7 @@
>> > - #include <sys/utsname.h>
>> > - #include <fcntl.h>
>> > - #include <unistd.h>
>> > -+#include "system.h"
>> > -
>> > - /* If fts.h is included before config.h, its indirect inclusions may not
>> > -    give us the right LFS aliases of these functions, so map them manually.  */
>> > -diff --git a/libelf/elf.h b/libelf/elf.h
>> > -index 8e3e618..1353890 100644
>> > ---- a/libelf/elf.h
>> > -+++ b/libelf/elf.h
>> > -@@ -19,6 +19,10 @@
>> > - #ifndef _ELF_H
>> > - #define       _ELF_H 1
>> > -
>> > -+#ifdef __cplusplus
>> > -+extern "C" {
>> > -+#endif
>> > -+
>> > - /* Standard ELF types.  */
>> > -
>> > - #include <stdint.h>
>> > -@@ -4102,4 +4106,7 @@ enum
>> > - #define R_ARC_TLS_LE_S9               0x4a
>> > - #define R_ARC_TLS_LE_32               0x4b
>> > -
>> > -+#ifdef __cplusplus
>> > -+}
>> > -+#endif
>> > - #endif        /* elf.h */
>> > diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
>> > index 2e379cdba6..85f8140330 100644
>> > --- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
>> > +++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
>> > @@ -1,4 +1,4 @@
>> > -From 2f94d488bf3daaa6a8548ee77120fc2506a9bbe3 Mon Sep 17 00:00:00 2001
>> > +From 934d21dc0b06b95c7c65cb29c5096decd91d4d5f Mon Sep 17 00:00:00 2001
>> >  From: Hongxu Jia <hongxu.jia@windriver.com>
>> >  Date: Fri, 23 Aug 2019 10:19:48 +0800
>> >  Subject: [PATCH] musl-utils
>> > @@ -57,7 +57,7 @@ index 2c6d91b..608646e 100644
>> >   ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
>> >
>> >  diff --git a/src/strip.c b/src/strip.c
>> > -index 70fc8c0..d035d9e 100644
>> > +index d5b753d..d6e1b64 100644
>> >  --- a/src/strip.c
>> >  +++ b/src/strip.c
>> >  @@ -46,6 +46,13 @@
>> > @@ -75,7 +75,7 @@ index 70fc8c0..d035d9e 100644
>> >
>> >   /* Name and version of program.  */
>> >  diff --git a/src/unstrip.c b/src/unstrip.c
>> > -index e488e81..0e44456 100644
>> > +index aacc9aa..5e71290 100644
>> >  --- a/src/unstrip.c
>> >  +++ b/src/unstrip.c
>> >  @@ -52,6 +52,15 @@
>> > diff --git a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
>> > deleted file mode 100644
>> > index 2fa60c333c..0000000000
>> > --- a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
>> > +++ /dev/null
>> > @@ -1,36 +0,0 @@
>> > -From 72819106d0e5666d172d39c24c19e4e7a3b8be0e Mon Sep 17 00:00:00 2001
>> > -From: Richard Purdie <richard.purdie@linuxfoundation.org>
>> > -Date: Wed, 1 May 2019 22:15:03 +0100
>> > -Subject: [PATCH] Fix error on musl:
>> > -
>> > -| ../../elfutils-0.176/tests/elfstrmerge.c: In function 'main':
>> > -| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: error: 'ALLPERMS' undeclared (first use in this function); did you mean 'EPERM'?
>> > -|        fdnew = open (fnew, O_WRONLY | O_CREAT, st.st_mode & ALLPERMS);
>> > -|                                                             ^~~~~~~~
>> > -|                                                             EPERM
>> > -| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: note: each undeclared identifier is reported only once for each function it appears in
>> > -
>> > -Upstream-Status: Inappropriate [workaround in musl]
>> > -
>> > -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> > -
>> > ----
>> > - tests/elfstrmerge.c | 5 +++++
>> > - 1 file changed, 5 insertions(+)
>> > -
>> > -diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
>> > -index 197c6a5..3683672 100644
>> > ---- a/tests/elfstrmerge.c
>> > -+++ b/tests/elfstrmerge.c
>> > -@@ -33,6 +33,11 @@
>> > - #include ELFUTILS_HEADER(dwelf)
>> > - #include "elf-knowledge.h"
>> > -
>> > -+/* for musl */
>> > -+#ifndef ALLPERMS
>> > -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
>> > -+#endif
>> > -+
>> > - /* The original ELF file.  */
>> > - static int fd = -1;
>> > - static Elf *elf = NULL;
>> > diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
>> > index 5cd6fffc27..c96cfd9777 100644
>> > --- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
>> > +++ b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
>> > @@ -1,4 +1,4 @@
>> > -From cfced441d4a6f2eca51d29c52240275bd6f54e49 Mon Sep 17 00:00:00 2001
>> > +From a2ce41e91d530459eb35d64a19f714ebfe0d4a20 Mon Sep 17 00:00:00 2001
>> >  From: Alexander Kanavin <alex.kanavin@gmail.com>
>> >  Date: Mon, 22 Jun 2020 21:35:16 +0000
>> >  Subject: [PATCH] config/eu.am: do not use -Werror
>> > @@ -16,10 +16,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> >   1 file changed, 2 deletions(-)
>> >
>> >  diff --git a/config/eu.am b/config/eu.am
>> > -index 2c3e457..8fb0411 100644
>> > +index 58cd3c4..ac42390 100644
>> >  --- a/config/eu.am
>> >  +++ b/config/eu.am
>> > -@@ -89,7 +89,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
>> > +@@ -91,7 +91,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
>> >             -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \
>> >             $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
>> >             $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
>> > @@ -27,7 +27,7 @@ index 2c3e457..8fb0411 100644
>> >             $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
>> >             $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
>> >             $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
>> > -@@ -99,7 +98,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
>> > +@@ -101,7 +100,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
>> >            $(TRAMPOLINES_WARNING) \
>> >            $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
>> >            $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
>> > diff --git a/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch b/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
>> > deleted file mode 100644
>> > index 9509fb4e77..0000000000
>> > --- a/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch
>> > +++ /dev/null
>> > @@ -1,138 +0,0 @@
>> > -glibc 2.34 calls pthread_kill from the raise function. Before raise
>> > -directly called the (tg)kill syscall. So allow pthread_kill to be the
>> > -first frame in a backtrace where raise is expected. Also change some
>> > -asserts to fprintf plus abort to make it more clear why the testcase
>> > -fails.
>> > -
>> > -https://sourceware.org/bugzilla/show_bug.cgi?id=28190
>> > -
>> > -Signed-off-by: Mark Wielaard <mark@klomp.org>
>> > -Upstream-Status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2021q3/004019.html]
>> > ----
>> > - tests/ChangeLog   |  6 +++++
>> > - tests/backtrace.c | 62 +++++++++++++++++++++++++++++++++++++++++------
>> > - 2 files changed, 61 insertions(+), 7 deletions(-)
>> > -
>> > -Index: elfutils-0.185/tests/ChangeLog
>> > -===================================================================
>> > ---- elfutils-0.185.orig/tests/ChangeLog
>> > -+++ elfutils-0.185/tests/ChangeLog
>> > -@@ -1,3 +1,9 @@
>> > -+2021-08-04  Mark Wielaard  <mark@klomp.org>
>> > -+
>> > -+      PR28190
>> > -+      * backtrace.c (callback_verify): Check for pthread_kill as first
>> > -+      frame. Change asserts to fprintf plus abort.
>> > -+
>> > - 2021-05-14  Frank Ch. Eigler <fche@redhat.com>
>> > -
>> > -       PR27859
>> > -Index: elfutils-0.185/tests/backtrace.c
>> > -===================================================================
>> > ---- elfutils-0.185.orig/tests/backtrace.c
>> > -+++ elfutils-0.185/tests/backtrace.c
>> > -@@ -97,6 +97,9 @@ callback_verify (pid_t tid, unsigned fra
>> > -   static bool reduce_frameno = false;
>> > -   if (reduce_frameno)
>> > -     frameno--;
>> > -+  static bool pthread_kill_seen = false;
>> > -+  if (pthread_kill_seen)
>> > -+    frameno--;
>> > -   if (! use_raise_jmp_patching && frameno >= 2)
>> > -     frameno += 2;
>> > -   const char *symname2 = NULL;
>> > -@@ -107,11 +110,26 @@ callback_verify (pid_t tid, unsigned fra
>> > -              && (strcmp (symname, "__kernel_vsyscall") == 0
>> > -                  || strcmp (symname, "__libc_do_syscall") == 0))
>> > -       reduce_frameno = true;
>> > -+      else if (! pthread_kill_seen && symname
>> > -+             && strstr (symname, "pthread_kill") != NULL)
>> > -+      pthread_kill_seen = true;
>> > -       else
>> > --      assert (symname && strcmp (symname, "raise") == 0);
>> > -+      {
>> > -+        if (!symname || strcmp (symname, "raise") != 0)
>> > -+          {
>> > -+            fprintf (stderr,
>> > -+                     "case 0: expected symname 'raise' got '%s'\n", symname);
>> > -+            abort ();
>> > -+          }
>> > -+      }
>> > -       break;
>> > -     case 1:
>> > --      assert (symname != NULL && strcmp (symname, "sigusr2") == 0);
>> > -+      if (symname == NULL || strcmp (symname, "sigusr2") != 0)
>> > -+      {
>> > -+        fprintf (stderr,
>> > -+                 "case 1: expected symname 'sigusr2' got '%s'\n", symname);
>> > -+        abort ();
>> > -+      }
>> > -       break;
>> > -     case 2: // x86_64 only
>> > -       /* __restore_rt - glibc maybe does not have to have this symbol.  */
>> > -@@ -120,11 +138,21 @@ callback_verify (pid_t tid, unsigned fra
>> > -       if (use_raise_jmp_patching)
>> > -       {
>> > -         /* Verify we trapped on the very first instruction of jmp.  */
>> > --        assert (symname != NULL && strcmp (symname, "jmp") == 0);
>> > -+        if (symname == NULL || strcmp (symname, "jmp") != 0)
>> > -+          {
>> > -+            fprintf (stderr,
>> > -+                     "case 3: expected symname 'raise' got '%s'\n", symname);
>> > -+            abort ();
>> > -+          }
>> > -         mod = dwfl_addrmodule (dwfl, pc - 1);
>> > -         if (mod)
>> > -           symname2 = dwfl_module_addrname (mod, pc - 1);
>> > --        assert (symname2 == NULL || strcmp (symname2, "jmp") != 0);
>> > -+        if (symname2 == NULL || strcmp (symname2, "jmp") != 0)
>> > -+          {
>> > -+            fprintf (stderr,
>> > -+                     "case 3: expected symname2 'jmp' got '%s'\n", symname2);
>> > -+            abort ();
>> > -+          }
>> > -         break;
>> > -       }
>> > -       FALLTHROUGH;
>> > -@@ -137,11 +165,22 @@ callback_verify (pid_t tid, unsigned fra
>> > -         duplicate_sigusr2 = true;
>> > -         break;
>> > -       }
>> > --      assert (symname != NULL && strcmp (symname, "stdarg") == 0);
>> > -+      if (symname == NULL || strcmp (symname, "stdarg") != 0)
>> > -+      {
>> > -+        fprintf (stderr,
>> > -+                 "case 4: expected symname 'stdarg' got '%s'\n", symname);
>> > -+        abort ();
>> > -+      }
>> > -       break;
>> > -     case 5:
>> > -       /* Verify we trapped on the very last instruction of child.  */
>> > --      assert (symname != NULL && strcmp (symname, "backtracegen") == 0);
>> > -+      if (symname == NULL || strcmp (symname, "backtracegen") != 0)
>> > -+      {
>> > -+        fprintf (stderr,
>> > -+                 "case 5: expected symname 'backtracegen' got '%s'\n",
>> > -+                 symname);
>> > -+        abort ();
>> > -+      }
>> > -       mod = dwfl_addrmodule (dwfl, pc);
>> > -       if (mod)
>> > -       symname2 = dwfl_module_addrname (mod, pc);
>> > -@@ -151,7 +190,15 @@ callback_verify (pid_t tid, unsigned fra
>> > -       // instructions or even inserts some padding instructions at the end
>> > -       // (which apparently happens on ppc64).
>> > -       if (use_raise_jmp_patching)
>> > --        assert (symname2 == NULL || strcmp (symname2, "backtracegen") != 0);
>> > -+      {
>> > -+          if (symname2 != NULL && strcmp (symname2, "backtracegen") == 0)
>> > -+          {
>> > -+            fprintf (stderr,
>> > -+                     "use_raise_jmp_patching didn't expect symname2 "
>> > -+                     "'backtracegen'\n");
>> > -+            abort ();
>> > -+          }
>> > -+      }
>> > -       break;
>> > -   }
>> > - }
>> > --
>> > 2.20.1
>> >

Re: [PATCH 22/36] elfutils: update 0.185 -> 0.186

[Khem Raj]

On Wed, Nov 17, 2021 at 11:11 AM Mark Wielaard <mark@klomp.org> wrote:
>
> Hi,
>
> I hack on elfutils upstream.
>
> On Wed, Nov 17, 2021 at 06:32:40PM +0100, Alexander Kanavin wrote:
> > On Wed, 17 Nov 2021 at 18:15, Khem Raj <raj.khem@gmail.com> wrote:
> > > > Rework support for error() on non-glibc targets:
> > > > upstream now provides its own implementation, so we can drop
> > > > the patch that adds ours; said implementation isn't
> > > > build-tested with tests, so ptest has to be disabled on musl.
> > >
> > > Overall this is an improvement so I am good with this patch.
> > > if upstream implementation does not pass ptests
> > > perhaps worth reporting upstream.
> >
> > I would if upstream would be interested in tests with anything except
> > glibc, but I'm fairly sure they're not. The tests don't even build with
> > musl without invasive patching.
>
> If you don't report issues we won't know there are any.  elfutils
> upstream is certainly focussed on glibc. And some of the musl
> developers are pretty hostile and agresssive, which certainly isn't
> appreciated. But we do appreciate bug reports and patches to support
> alternative libc implementations where they make sense and help
> others.

Thanks Mark, good point about creating bug reports at least.

>
> Cheers,
>
> Mark
>

Re: [PATCH 22/36] elfutils: update 0.185 -> 0.186

[Alexander Kanavin]

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

Another problem is that who will run those tests with musl regularly and
ensure they won't regress again? We don't do it, upstream doesn't do it, so
then why spend time fixing them?

Alex

On Wed, 17 Nov 2021 at 20:18, Khem Raj <raj.khem@gmail.com> wrote:

> On Wed, Nov 17, 2021 at 11:11 AM Mark Wielaard <mark@klomp.org> wrote:
> >
> > Hi,
> >
> > I hack on elfutils upstream.
> >
> > On Wed, Nov 17, 2021 at 06:32:40PM +0100, Alexander Kanavin wrote:
> > > On Wed, 17 Nov 2021 at 18:15, Khem Raj <raj.khem@gmail.com> wrote:
> > > > > Rework support for error() on non-glibc targets:
> > > > > upstream now provides its own implementation, so we can drop
> > > > > the patch that adds ours; said implementation isn't
> > > > > build-tested with tests, so ptest has to be disabled on musl.
> > > >
> > > > Overall this is an improvement so I am good with this patch.
> > > > if upstream implementation does not pass ptests
> > > > perhaps worth reporting upstream.
> > >
> > > I would if upstream would be interested in tests with anything except
> > > glibc, but I'm fairly sure they're not. The tests don't even build with
> > > musl without invasive patching.
> >
> > If you don't report issues we won't know there are any.  elfutils
> > upstream is certainly focussed on glibc. And some of the musl
> > developers are pretty hostile and agresssive, which certainly isn't
> > appreciated. But we do appreciate bug reports and patches to support
> > alternative libc implementations where they make sense and help
> > others.
>
> Thanks Mark, good point about creating bug reports at least.
>
> >
> > Cheers,
> >
> > Mark
> >
>

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

[PATCH 23/36] libsamplerate0: update 0.1.9 -> 0.2.2

[Alexander Kanavin]

Upstream moved to github.

Drop both patches: alsa configuration merged upstream,
shared version info fixed upstream.

License-Update: urls changed to github.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-configure.ac-improve-alsa-handling.patch | 62 -------------------
 .../libsamplerate0/shared_version_info.patch  | 13 ----
 ...rate0_0.1.9.bb => libsamplerate0_0.2.2.bb} | 14 ++---
 3 files changed, 5 insertions(+), 84 deletions(-)
 delete mode 100644 meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch
 delete mode 100644 meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch
 rename meta/recipes-multimedia/libsamplerate/{libsamplerate0_0.1.9.bb => libsamplerate0_0.2.2.bb} (60%)

diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch b/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch
deleted file mode 100644
index d19b514e6b..0000000000
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 957ebce3837588f71016e37ffaf9aad0a9d41cec Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanuk@iki.fi>
-Date: Fri, 23 Sep 2016 12:02:06 +0300
-Subject: [PATCH] configure.ac: improve alsa handling
-
-Three improvements:
-
-1) "--enable-alsa" or "--disable-alsa" caused a warning about an
-unsupported configure option, because AC_ARG_ENABLE was not used.
-
-2) If alsa was disabled, the "Have ALSA" item in the summary would print
-an empty string instead of "no".
-
-3) If "--enable-alsa" was passed to configure, but the headers were not
-found, configure would still succeed (with alsa disabled). It's better
-to fail and abort configure if a feature that was explicitly requested
-can't be enabled.
-
-Upstream-Status: Submitted [sent to src@mega-nerd.com]
-
-Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
----
- configure.ac | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 474c6ab..bad597e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,6 +101,9 @@ AC_ARG_ENABLE(cpu-clip,
- 		AC_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific clipper]),
- 		ac_arg_cpu_clip="N", ac_arg_cpu_clip="Y")
- 
-+AC_ARG_ENABLE(alsa,
-+                AC_HELP_STRING([--disable-alsa], [disable ALSA support in the varispeed-play example program]))
-+
- #====================================================================================
- # Check types and their sizes.
- 
-@@ -194,6 +197,10 @@ if test x$enable_alsa != xno ; then
- 	if test x$ac_cv_header_alsa_asoundlib_h = xyes ; then
- 		ALSA_LIBS="-lasound"
- 		enable_alsa=yes
-+        elif test x$enable_alsa = xyes ; then
-+                AC_MSG_ERROR(["ALSA headers not found"])
-+        else
-+                enable_alsa=no
- 		fi
- 	fi
- 
-@@ -340,7 +347,7 @@ AC_MSG_RESULT([
-     Have FFTW : ................... ${ac_cv_fftw3}])
- 
- AC_MSG_RESULT([    Have libsndfile : ............. ${ac_cv_sndfile}])
--AC_MSG_RESULT([    Have ALSA : ................... ${ac_cv_header_alsa_asoundlib_h}
-+AC_MSG_RESULT([    Have ALSA : ................... ${enable_alsa}
- ])
- 
- AC_MSG_RESULT([  Installation directories :
--- 
-2.9.3
-
diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch b/meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch
deleted file mode 100644
index b42d564b4b..0000000000
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libsamplerate-0.1.8/configure.ac
-===================================================================
---- libsamplerate-0.1.8.orig/configure.ac
-+++ libsamplerate-0.1.8/configure.ac
-@@ -53,7 +53,7 @@ AC_PROG_LN_S
- #  6. If any interfaces have been removed since the last public release, then set age
- #     to 0.
- 
--SHARED_VERSION_INFO="1:8:1"
-+SHARED_VERSION_INFO="1:9:1"
- 
- 
- 
diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb
similarity index 60%
rename from meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb
rename to meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb
index 8345d6880f..ed2b6437dd 100644
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb
+++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb
@@ -1,24 +1,20 @@
 SUMMARY = "Audio Sample Rate Conversion library"
 DESCRIPTION = "Also known as Secret Rabbit Code - a library for performing sample rate conversion of audio data."
-HOMEPAGE = "http://www.mega-nerd.com/SRC/"
+HOMEPAGE = "https://libsndfile.github.io/libsamplerate/"
 SECTION = "libs"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=336d6faf40fb600bafb0061f4052f1f4 \
-                    file://src/samplerate.c;beginline=1;endline=7;md5=5b6982a8c2811c7312c13cccbf55f55e"
+                    file://src/samplerate.c;beginline=1;endline=7;md5=7a4238289dc36bfb70968ccaa5bd0d4f"
 DEPENDS = "libsndfile1"
-PR = "r1"
 
-SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz \
-           file://0001-configure.ac-improve-alsa-handling.patch \
-           file://shared_version_info.patch \
+SRC_URI = "https://github.com/libsndfile/libsamplerate/releases/download/${PV}/libsamplerate-${PV}.tar.xz \
 "
 
-SRC_URI[md5sum] = "2b78ae9fe63b36b9fbb6267fad93f259"
-SRC_URI[sha256sum] = "0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1"
+SRC_URI[sha256sum] = "3258da280511d24b49d6b08615bbe824d0cacc9842b0e4caf11c52cf2b043893"
 
 CVE_PRODUCT = "libsamplerate"
 
-UPSTREAM_CHECK_URI = "http://www.mega-nerd.com/SRC/download.html"
+UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsamplerate/releases"
 
 S = "${WORKDIR}/libsamplerate-${PV}"
 
-- 
2.20.1

[PATCH 24/36] patches: correct whitespace/spelling for Upstream-Status tags

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...001-Makefile.am-fix-undefined-function-for-libnsm.a.patch | 2 +-
 ...-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch | 2 +-
 ...ysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch | 2 +-
 meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch | 2 +-
 meta/recipes-core/sysvinit/sysvinit/realpath.patch           | 2 +-
 ...fd-Close-the-file-descriptor-if-there-is-no-archive.patch | 2 +-
 .../bootchart2/0001-bootchart2-support-usrmerge.patch        | 2 +-
 .../dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch          | 2 +-
 .../files/0001-skip-the-test-when-gcc-not-deployed.patch     | 2 +-
 .../recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch | 2 +-
 meta/recipes-devtools/patch/patch/CVE-2019-13636.patch       | 2 +-
 meta/recipes-devtools/patch/patch/CVE-2019-20633.patch       | 2 +-
 meta/recipes-devtools/perl/files/native-perlinc.patch        | 2 +-
 meta/recipes-devtools/perl/files/perl-dynloader.patch        | 2 +-
 .../strace/0001-Avoid-relying-on-presence-of-ipx.h.patch     | 2 +-
 .../0001-configure-use-pkg-config-for-pcre-detection.patch   | 2 +-
 ...evert-tests-wait-for-complete-rebuild-in-integrity-.patch | 2 +-
 .../mdadm/files/0001-mdadm-skip-test-11spare-migration.patch | 2 +-
 .../tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch            | 5 ++---
 .../jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch | 2 +-
 .../xf86-video-vmware/0002-add-option-for-vmwgfx.patch       | 2 +-
 ...ix-cpu-hotplug-Remove-deprecated-CPU-hotplug-functi.patch | 2 +-
 ...ix-Revert-Makefile-Enable-Wimplicit-fallthrough-for.patch | 2 +-
 .../apr/apr-util/0001-Fix-error-handling-in-gdbm.patch       | 3 +--
 ...001-confiure.ac-Believe-the-cflags-from-environment.patch | 2 +-
 .../recipes-support/vim/files/disable_acl_header_check.patch | 2 +-
 26 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch
index bd350144e3..7603eb680d 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch
@@ -19,7 +19,7 @@ As there is already one source file named file.c
 as support/nsm/file.c in support/nsm/Makefile.am,
 so rename ../support/misc/file.c to ../support/misc/misc.c.
 
-Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502780423058&w=2]
+Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=154502780423058&w=2]
 
 Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
 
diff --git a/meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
index c2766ef4c3..474cea5a0d 100644
--- a/meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
+++ b/meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
@@ -10,7 +10,7 @@ ${S}/.pc/aarch64-0001-glibc-fsf-v1-eaf6f205.patch/ports/sysdeps/
 aarch64/libm-test-ulps), run libm-err-tab.pl with specific dirs
 in ${S}.
 
-Upstream-Status: inappropriate [OE specific]
+Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Ting Liu <b28495@freescale.com>
 ---
diff --git a/meta/recipes-core/glibc/glibc/0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/meta/recipes-core/glibc/glibc/0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
index e8332a53c2..1b99af7110 100644
--- a/meta/recipes-core/glibc/glibc/0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
+++ b/meta/recipes-core/glibc/glibc/0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
@@ -4,7 +4,7 @@ Date: Wed, 18 Mar 2015 00:27:10 +0000
 Subject: [PATCH] sysdeps/gnu/configure.ac: handle correctly
  $libc_cv_rootsbindir
 
-Upstream-Status:Pending
+Upstream-Status: Pending
 
 Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
diff --git a/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch b/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch
index 494aa0e012..17f72b4829 100644
--- a/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch
+++ b/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch
@@ -10,7 +10,7 @@ each other's pids.
 
 https://bugzilla.redhat.com/show_bug.cgi?id=883856
 
-Upstream-Status: backport
+Upstream-Status: Backport
 Imported patch from: https://bugzilla.redhat.com/attachment.cgi?id=658166
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
diff --git a/meta/recipes-core/sysvinit/sysvinit/realpath.patch b/meta/recipes-core/sysvinit/sysvinit/realpath.patch
index 859fd8baad..b559aa3b49 100644
--- a/meta/recipes-core/sysvinit/sysvinit/realpath.patch
+++ b/meta/recipes-core/sysvinit/sysvinit/realpath.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix build on musl use realpath() API its available on all
 realpath() API doesnt work on systems with PATH_MAX set to be unlimited e.g. GNU/Hurd
 However for Linux it should always work
 
-Upstream-Status: Inappropriate[Linux specific]
+Upstream-Status: Inappropriate [Linux specific]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
diff --git a/meta/recipes-devtools/binutils/binutils/0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch b/meta/recipes-devtools/binutils/binutils/0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch
index 9becee39a2..924980b4e8 100644
--- a/meta/recipes-devtools/binutils/binutils/0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch
+++ b/meta/recipes-devtools/binutils/binutils/0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch
@@ -33,7 +33,7 @@ ld/
 (cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
 (cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
 
-Upstream-Status: Accepted[https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0]
+Upstream-Status: Accepted [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0]
 ---
  bfd/plugin.c                       |  8 +++++++
  ld/testsuite/ld-plugin/lto.exp     | 34 ++++++++++++++++++++++++++++++
diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
index 8ee6723df1..88597cf3a9 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
+++ b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch
@@ -3,7 +3,7 @@ From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 5 Sep 2019 18:37:31 +0800
 Subject: [PATCH] bootchart2: support usrmerge
 
-Upstream-Status: Inappropriate[oe-specific]
+Upstream-Status: Inappropriate [oe-specific]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch
index 50e6894406..d66ab4476a 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch
@@ -3,7 +3,7 @@ From: sweeaun <swee.aun.khor@intel.com>
 Date: Sun, 10 Sep 2017 00:14:15 -0700
 Subject: [PATCH] dpkg: Support muslx32 build
 
-Upstream-Status: Pending.
+Upstream-Status: Pending
 Changes made on ostable and tupletable to enable muslx32 build.
 
 Signed-off-by: sweeaun <swee.aun.khor@intel.com>
diff --git a/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch b/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch
index 114ca63cb5..0e6bf5573c 100644
--- a/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] skip the test when gcc not deployed
 Skip the tests which depend on gcc when
 gcc not deployed.
 
-Upstream-Status: Submitted[https://sourceware.org/ml/elfutils-devel/2019-q2/msg00091.html]
+Upstream-Status: Submitted [https://sourceware.org/ml/elfutils-devel/2019-q2/msg00091.html]
 
 Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
 
diff --git a/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch
index 8184e68743..5f14dd2a58 100644
--- a/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch
@@ -23,7 +23,7 @@ Do same for riscv64, aarch64 & arc
 
 RP 15/8/11
 
-Upstream-Status: Inappropriate[OE-Specific]
+Upstream-Status: Inappropriate [OE-Specific]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
diff --git a/meta/recipes-devtools/patch/patch/CVE-2019-13636.patch b/meta/recipes-devtools/patch/patch/CVE-2019-13636.patch
index 9f8b6db0b9..8059d9fe19 100644
--- a/meta/recipes-devtools/patch/patch/CVE-2019-13636.patch
+++ b/meta/recipes-devtools/patch/patch/CVE-2019-13636.patch
@@ -11,7 +11,7 @@ that consistently for input files.
 with O_CREAT | O_EXCL to avoid following symlinks in that case as well.
 
 CVE: CVE-2019-13636
-Upstream-Status: Backport[https://git.savannah.gnu.org/cgit/patch.git/patch/?id=dce4683cbbe107a95f1f0d45fabc304acfb5d71a]
+Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/patch.git/patch/?id=dce4683cbbe107a95f1f0d45fabc304acfb5d71a]
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 
 ---
diff --git a/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch b/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch
index 03988a179c..9b2c07cf1e 100644
--- a/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch
+++ b/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch
@@ -7,7 +7,7 @@ Subject: Avoid invalid memory access in context format diffs
 diffs.
 
 CVE: CVE-2019-20633
-Upstream-Status: Backport[https://git.savannah.gnu.org/cgit/patch.git/patch/?id=15b158db3ae11cb835f2eb8d2eb48e09d1a4af48]
+Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/patch.git/patch/?id=15b158db3ae11cb835f2eb8d2eb48e09d1a4af48]
 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
 
 ---
diff --git a/meta/recipes-devtools/perl/files/native-perlinc.patch b/meta/recipes-devtools/perl/files/native-perlinc.patch
index a2e1aefd41..20d7fe6060 100644
--- a/meta/recipes-devtools/perl/files/native-perlinc.patch
+++ b/meta/recipes-devtools/perl/files/native-perlinc.patch
@@ -1,4 +1,4 @@
-Upstream-Status:Inappropriate [embedded specific]
+Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm
diff --git a/meta/recipes-devtools/perl/files/perl-dynloader.patch b/meta/recipes-devtools/perl/files/perl-dynloader.patch
index 6bb832a426..b49e6e4066 100644
--- a/meta/recipes-devtools/perl/files/perl-dynloader.patch
+++ b/meta/recipes-devtools/perl/files/perl-dynloader.patch
@@ -1,4 +1,4 @@
-Upstream-Status:Inappropriate [embedded specific]
+Upstream-Status: Inappropriate [embedded specific]
 
 Allow the location that .so files are searched for for dynamic
 loading to be changed via an environment variable. This is to allow
diff --git a/meta/recipes-devtools/strace/strace/0001-Avoid-relying-on-presence-of-ipx.h.patch b/meta/recipes-devtools/strace/strace/0001-Avoid-relying-on-presence-of-ipx.h.patch
index 6df673fa95..e791b4130d 100644
--- a/meta/recipes-devtools/strace/strace/0001-Avoid-relying-on-presence-of-ipx.h.patch
+++ b/meta/recipes-devtools/strace/strace/0001-Avoid-relying-on-presence-of-ipx.h.patch
@@ -24,7 +24,7 @@ check_ipx.
 
 Closes: https://github.com/strace/strace/issues/201
 
-Upstream-Status: backport [commit cca828197c0e1 branch esyr/5.15]
+Upstream-Status: Backport [commit cca828197c0e1 branch esyr/5.15]
 
 [bva: changed context to apply to a released strace 5.14 tarball]
 Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
diff --git a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
index 114de7ed94..fdb9760e89 100644
--- a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
+++ b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
@@ -4,7 +4,7 @@ Date: Tue, 17 Jun 2014 08:18:17 +0200
 Subject: [PATCH] configure: use pkg-config for pcre detection
 
 Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-Upstream-Status: pending
+Upstream-Status: Pending
 ---
  configure.ac | 38 +++++++-------------------------------
  1 file changed, 7 insertions(+), 31 deletions(-)
diff --git a/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch b/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch
index b196084a5c..fb4bc165fb 100644
--- a/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch
+++ b/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch
@@ -10,7 +10,7 @@ use the previous logic "check wait" which also used
 commonly by other tests such as tests/02r5grow, tests/07revert-grow
 and etc.
 
-Upstream-Status: Submitted[https://marc.info/?l=linux-raid&m=156317157314030&w=2]
+Upstream-Status: Submitted [https://marc.info/?l=linux-raid&m=156317157314030&w=2]
 
 Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
 ---
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
index 3a192cc95c..84517caade 100644
--- a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
@@ -17,7 +17,7 @@ done
 "try" includes near 20 sub testcase, so there are nearly 80 subcases need to run,
 so it will take long time than ptest-runner timeout limit, skip it as workaround.
 
-Upstream-Status: Inappropriate[oe-specific]
+Upstream-Status: Inappropriate [oe-specific]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch
index 8e46df8e1e..cf4f993c1a 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch
@@ -7,9 +7,8 @@ Date:   Tue Feb 12 09:53:50 2013 -0500
     Added support for socklen_t type to len argument passed to socket related
     calls. This fixes a bug that causes tcp wrappers to fail when using sshd.
     
-    Upstream-Status: Pending
-    
-    Signed-off-by: farrah rashid <farrah.rashid@windriver.com>
+Upstream-Status: Pending
+Signed-off-by: farrah rashid <farrah.rashid@windriver.com>
 
 diff --git a/fix_options.c b/fix_options.c
 index 7473adf..fe2b442 100644
diff --git a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
index 152db441bc..fab5109f83 100644
--- a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
+++ b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
@@ -7,7 +7,7 @@ Fix package qa errors like below:
 libjpeg.so.62.3.0 contains probably-redundant RPATH /usr/lib [useless-rpaths]
 usr/bin/cjpeg contains probably-redundant RPATH /usr/lib
 
-Upstream-Status: Inappropriate[oe-specific]
+Upstream-Status: Inappropriate [oe-specific]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
index 5bda720ce5..b37f697aa4 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
@@ -3,7 +3,7 @@ From: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Date: Fri, 9 Dec 2016 14:35:45 +0200
 Subject: [PATCH] Add option for vmwgfx
 
-Upstream-Status:Submitted
+Upstream-Status: Submitted
 
 Signed-off-by: Ross Burton <ross.burton@intel.com>
 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-cpu-hotplug-Remove-deprecated-CPU-hotplug-functi.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-cpu-hotplug-Remove-deprecated-CPU-hotplug-functi.patch
index 4e52e5f122..08ad2ddaa8 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-cpu-hotplug-Remove-deprecated-CPU-hotplug-functi.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-cpu-hotplug-Remove-deprecated-CPU-hotplug-functi.patch
@@ -37,7 +37,7 @@ Introduced in v4.13 :
 
     Rename all instances in the cpu hotplug code while at it.
 
-Upstream-Status: backport [https://git.lttng.org/?p=lttng-modules.git;a=commit;h=ffcc873470121ef1ebb110df3d9038a38d9cb7cb]
+Upstream-Status: Backport [https://git.lttng.org/?p=lttng-modules.git;a=commit;h=ffcc873470121ef1ebb110df3d9038a38d9cb7cb]
 
 Change-Id: I5a37cf5afc075a402b7347989fac637dfa60a1ed
 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-fix-Revert-Makefile-Enable-Wimplicit-fallthrough-for.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-fix-Revert-Makefile-Enable-Wimplicit-fallthrough-for.patch
index 5b5edc5319..14185efa40 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0002-fix-Revert-Makefile-Enable-Wimplicit-fallthrough-for.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0002-fix-Revert-Makefile-Enable-Wimplicit-fallthrough-for.patch
@@ -73,7 +73,7 @@ See upstream commit by the man himself:
 
     so if clang ever fixes its bad behavior we can try enabling it there again.
 
-Upstream-Status: backport [https://git.lttng.org/?p=lttng-modules.git;a=commit;h=c190d76e8c7b44d62b3651ab845b765c1b1f8104]
+Upstream-Status: Backport [https://git.lttng.org/?p=lttng-modules.git;a=commit;h=c190d76e8c7b44d62b3651ab845b765c1b1f8104]
 
 Change-Id: Iea69849592fb69ac04fb9bb28efcd6b8dce8ba88
 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
diff --git a/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch b/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch
index 57e7453312..6f27876a7f 100644
--- a/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch
+++ b/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch
@@ -13,8 +13,7 @@ what the berkleydb driver already does.
 
 Also ensure that dsize is 0 if dptr == NULL.
 
-Upstream-Status: Backport[https://svn.apache.org/viewvc?
-view=revision&amp;revision=1825311]
+Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&amp;revision=1825311]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
diff --git a/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch
index 56564db505..b26f4db98e 100644
--- a/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch
+++ b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch
@@ -12,8 +12,8 @@ Secondly, dont set armv4 for march when no selection
 is made, since it is passed from cmdline
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Inappropriate [OE-Specific]
 ---
-Upstream-Status: Inappropriate[OE-Specific]
 
  configure.ac | 11 -----------
  1 file changed, 11 deletions(-)
diff --git a/meta/recipes-support/vim/files/disable_acl_header_check.patch b/meta/recipes-support/vim/files/disable_acl_header_check.patch
index 33089162b4..26335d3297 100644
--- a/meta/recipes-support/vim/files/disable_acl_header_check.patch
+++ b/meta/recipes-support/vim/files/disable_acl_header_check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] disable acl header check
 
 Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny.
 
-Upstream-Status: pending
+Upstream-Status: Pending
 
 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-- 
2.20.1

[PATCH 25/36] autoconf: add missing Upstream-Status to patches

[Alexander Kanavin]

All of them seem like very old, very oe specific tweaks; please adjust otherwise.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch | 1 +
 .../autoconf/autoconf/autotest-automake-result-format.patch     | 1 +
 meta/recipes-devtools/autoconf/autoconf/preferbash.patch        | 2 ++
 meta/recipes-devtools/autoconf/autoconf/program_prefix.patch    | 1 +
 .../autoconf/autoconf/remove-usr-local-lib-from-m4.patch        | 1 +
 5 files changed, 6 insertions(+)

diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
index 374b939404..c73aca41ee 100644
--- a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
@@ -3,6 +3,7 @@ From: Ross Burton <ross.burton@intel.com>
 Date: Thu, 12 Mar 2020 17:25:23 +0000
 Subject: [PATCH 4/7] autoreconf-exclude.patch
 
+Upstream-Status: Inappropriate [oe specific]
 ---
  bin/autoreconf.in | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
diff --git a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
index de048d23d7..23329f7927 100644
--- a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
@@ -3,6 +3,7 @@ From: Ross Burton <ross.burton@intel.com>
 Date: Thu, 12 Mar 2020 17:25:45 +0000
 Subject: [PATCH 6/7] autotest-automake-result-format.patch
 
+Upstream-Status: Inappropriate [oe specific]
 ---
  lib/autotest/general.m4 | 39 +++++++++++++++++++++++++++++----------
  1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-devtools/autoconf/autoconf/preferbash.patch b/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
index 3979e83f70..cfb145a279 100644
--- a/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
@@ -14,6 +14,8 @@ known for their conciseness).
 
 Change the search order to bash then sh, so that a known-good shell (bash)
 is used if available over something which is merely POSIX compliant.
+
+Upstream-Status: Inappropriate [oe specific]
 ---
  lib/m4sugar/m4sh.m4 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch b/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
index 4ff535fc15..657cbb351b 100644
--- a/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
@@ -3,6 +3,7 @@ From: Ross Burton <ross.burton@intel.com>
 Date: Thu, 12 Mar 2020 17:28:38 +0000
 Subject: [PATCH 3/7] program_prefix.patch
 
+Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Ross Burton <ross.burton@intel.com>
 ---
  lib/autoconf/general.m4 | 2 +-
diff --git a/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch b/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
index b842f14f4f..f38780130a 100644
--- a/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
@@ -3,6 +3,7 @@ From: Ross Burton <ross.burton@intel.com>
 Date: Thu, 12 Mar 2020 17:25:37 +0000
 Subject: [PATCH 1/7] remove-usr-local-lib-from-m4.patch
 
+Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Ross Burton <ross.burton@intel.com>
 ---
  lib/autoconf/functions.m4 | 9 ---------
-- 
2.20.1

[PATCH 26/36] libxml2: add missing Upstream-Status tag

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-core/libxml/libxml2/remove-fuzz-from-ptests.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/libxml/libxml2/remove-fuzz-from-ptests.patch b/meta/recipes-core/libxml/libxml2/remove-fuzz-from-ptests.patch
index e80c46054e..66694af388 100644
--- a/meta/recipes-core/libxml/libxml2/remove-fuzz-from-ptests.patch
+++ b/meta/recipes-core/libxml/libxml2/remove-fuzz-from-ptests.patch
@@ -9,6 +9,7 @@ folder fuzz. These tests are not required for ptests of this package.
 This patch removes the fuzz testing targets from the Makefile.
 Otherwise, running the ptests will fail due to the invalid directory.
 
+Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com>
 ---
  Makefile.am | 5 ++---
-- 
2.20.1

[PATCH 27/36] unfs3: add missing Upstream-Status tag

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/unfs3/unfs3/no-yywrap.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-devtools/unfs3/unfs3/no-yywrap.patch b/meta/recipes-devtools/unfs3/unfs3/no-yywrap.patch
index e0746ad518..e3496814d8 100644
--- a/meta/recipes-devtools/unfs3/unfs3/no-yywrap.patch
+++ b/meta/recipes-devtools/unfs3/unfs3/no-yywrap.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Backport [https://github.com/unfs3/unfs3/commit/3fa0568e6ef96e045286afe18444bc28fe93962b]
+
 diff --git a/Config/exports.l b/Config/exports.l
 index 662603c..7e7c4fc 100644
 --- a/Config/exports.l
-- 
2.20.1

[PATCH 28/36] libnl: add missing Upstream-Status tag

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-support/libnl/files/enable-serial-tests.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-support/libnl/files/enable-serial-tests.patch b/meta/recipes-support/libnl/files/enable-serial-tests.patch
index 8ea53f8748..db774ad821 100644
--- a/meta/recipes-support/libnl/files/enable-serial-tests.patch
+++ b/meta/recipes-support/libnl/files/enable-serial-tests.patch
@@ -5,6 +5,7 @@ Subject: [PATCH] Add ptest for libnl
 
 serial-tests is required to generate those targets.
 
+Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Eric Xu <chi.xu@windriver.com>
 ---
  configure.ac | 2 +-
-- 
2.20.1

[PATCH 29/36] kea: add missing Upstream-Status to a patch

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
index 8de9fce4b4..78f475a495 100644
--- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
+++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
@@ -12,6 +12,7 @@ Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
 Because they are all commented out, replace the expanded libdir path with
 '$libdir' in the config files to avoid conflict.
 
+Upstream-Status: Pending
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 
 ---
-- 
2.20.1

[PATCH 30/36] rust-hello-world: add missing Upstream-Status to a patch

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../rust-hello-world/rust-hello-world/0001-enable-LTO.patch      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-example/rust-hello-world/rust-hello-world/0001-enable-LTO.patch b/meta/recipes-example/rust-hello-world/rust-hello-world/0001-enable-LTO.patch
index 56ef9e73e6..f319545ee1 100644
--- a/meta/recipes-example/rust-hello-world/rust-hello-world/0001-enable-LTO.patch
+++ b/meta/recipes-example/rust-hello-world/rust-hello-world/0001-enable-LTO.patch
@@ -3,6 +3,7 @@ From: Dan Callaghan <dan.callaghan@opengear.com>
 Date: Fri, 5 Feb 2021 08:56:34 +1000
 Subject: [PATCH] enable LTO
 
+Upstream-Status: Pending
 ---
  Cargo.toml | 3 +++
  1 file changed, 3 insertions(+)
-- 
2.20.1

[PATCH 31/36] numactl: add missing Upstream-Status to a patch

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../numactl/numactl/0001-define-run-test-target.patch           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch
index 78ffb22f89..9e65a45133 100644
--- a/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch
+++ b/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch
@@ -1,6 +1,6 @@
 rename test target as run-test
 
-Upstream-Statue: Pending
+Upstream-Status: Pending
 
 test target not only compile the test files, but also run them, which is
 not suitable for cross-compile environment, so rename it as run-test.
-- 
2.20.1

[PATCH 32/36] insane.bbclass: add a check that Upstream-Status patch tag is present and correctly formed

[Alexander Kanavin]

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

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 27b1a00fb9..240f3aad62 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1167,6 +1167,30 @@ python do_qa_patch() {
                 bb.warn(msg)
             msg = "Patch log indicates that patches do not apply cleanly."
             oe.qa.handle_error("patch-fuzz", msg, d)
+
+    # Check if the patch contains a correctly formatted and spelled Upstream-Status
+    import re
+    from oe import patch
+
+    for url in patch.src_patches(d):
+       (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url)
+
+       # skip patches not in oe-core
+       if '/meta/' not in fullpath:
+           continue
+
+       content = open(fullpath, encoding='utf-8', errors='ignore').read()
+       kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE)
+       strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Accepted|Inappropriate|Backport)( .+)?$", re.MULTILINE)
+       match_kinda = kinda_status_re.search(content)
+       match_strict = strict_status_re.search(content)
+       guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status"
+
+       if not match_strict:
+           if match_kinda:
+               bb.error("Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0)))
+           else:
+               bb.error("Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines))
 }
 
 python do_qa_configure() {
-- 
2.20.1

[PATCH 33/36] expect: do not install examples, drop related patch

[Alexander Kanavin]

There is really no reason to install them; this was done
in the original recipe submission for unexplained reasons.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../expect/expect/01-example-shebang.patch    | 144 ------------------
 meta/recipes-devtools/expect/expect_5.45.4.bb |   2 -
 2 files changed, 146 deletions(-)
 delete mode 100644 meta/recipes-devtools/expect/expect/01-example-shebang.patch

diff --git a/meta/recipes-devtools/expect/expect/01-example-shebang.patch b/meta/recipes-devtools/expect/expect/01-example-shebang.patch
deleted file mode 100644
index 8597f31387..0000000000
--- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Author: Mike Markley <mike@markley.org>
-Author: Sergei Golovan <sgolovan@debian.org>
-Description: Fixes shebangs in examples (Closes: #152367).
-
-Backported from Debian
-
-Upstream-Status: Pending
-Index: expect5.45/example/beer.exp
-===================================================================
---- expect5.45.orig/example/beer.exp	2006-01-25 13:51:39.000000000 -0800
-+++ expect5.45/example/beer.exp	2013-11-01 17:35:19.817318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect -f
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # 99 bottles of beer on the wall, Expect-style
- # Author: Don Libes <libes@nist.gov>
-Index: expect5.45/example/expectd.proto
-===================================================================
---- expect5.45.orig/example/expectd.proto	2010-07-02 09:03:31.000000000 -0700
-+++ expect5.45/example/expectd.proto	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,10 @@
--#!/depot/tcl/src/expect/e --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
-+
- # Description: Simple fragment to begin a telnet daemon
- # For more information, see Chapter 17 of "Exploring Expect"
- # Author: Don Libes, NIST
-Index: expect5.45/example/irsh
-===================================================================
---- expect5.45.orig/example/irsh	2010-07-02 09:03:31.000000000 -0700
-+++ expect5.45/example/irsh	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # Do rsh interactively.  For example, consider the following command:
- #    rsh <remote> ls -l "|" more
-Index: expect5.45/example/passwd.cgi
-===================================================================
---- expect5.45.orig/example/passwd.cgi	2000-01-06 15:22:07.000000000 -0800
-+++ expect5.45/example/passwd.cgi	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # This is a CGI script to process requests created by the accompanying
- # passwd.html form.  This script is pretty basic, although it is
-Index: expect5.45/example/passwdprompt
-===================================================================
---- expect5.45.orig/example/passwdprompt	2003-09-05 12:01:59.000000000 -0700
-+++ expect5.45/example/passwdprompt	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # This script prompts for a passwd from stdin while echoing *'s
- 
-Index: expect5.45/example/reprompt
-===================================================================
---- expect5.45.orig/example/reprompt	2000-01-06 15:22:07.000000000 -0800
-+++ expect5.45/example/reprompt	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # Name: reprompt
- # Description: reprompt every so often until user enters something
-Index: expect5.45/example/term_expect
-===================================================================
---- expect5.45.orig/example/term_expect	2005-02-15 10:11:31.000000000 -0800
-+++ expect5.45/example/term_expect	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expectk
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec wish "$0" ${1+"$@"}
-+
-+package require Expect
- 
- # Name: tkterm - terminal emulator using Expect and Tk text widget, v3.0
- # Author: Don Libes, July '94
-Index: expect5.45/example/vrfy
-===================================================================
---- expect5.45.orig/example/vrfy	2010-07-02 09:03:31.000000000 -0700
-+++ expect5.45/example/vrfy	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,9 @@
--#!/depot/path/expect -f
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
- 
- 
- # separate address into user and host
-Index: expect5.45/example/xrlogin
-===================================================================
---- expect5.45.orig/example/xrlogin	2000-01-06 15:22:08.000000000 -0800
-+++ expect5.45/example/xrlogin	2013-11-01 17:35:19.821318341 -0700
-@@ -1,4 +1,10 @@
--#!/depot/path/expect --
-+#!/bin/sh
-+# -*- tcl -*-
-+# The next line is executed by /bin/sh, but not tcl \
-+exec tclsh "$0" ${1+"$@"}
-+
-+package require Expect
-+
- # xrlogin - rlogin but with current DISPLAY
- #
- # You can extend this idea to save any arbitrary information across rlogin
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
index e27b0d9d71..4214ab0f27 100644
--- a/meta/recipes-devtools/expect/expect_5.45.4.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
@@ -21,7 +21,6 @@ inherit autotools update-alternatives
 SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
            file://0001-configure.in.patch \
            file://0002-tcl.m4.patch \
-           file://01-example-shebang.patch \
            file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
            file://0001-Resolve-string-formatting-issues.patch \
            file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
@@ -39,7 +38,6 @@ do_install:append() {
 	install -d ${D}${libdir}
         install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so   ${D}${libdir}/
         install -m 0755 ${S}/fixline1           ${D}${libdir}/expect${PV}/
-        install -m 0755 ${S}/example/*          ${D}${libdir}/expect${PV}/
         rm ${D}${libdir}/expect${PV}/libexpect*.so
         sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
 }
-- 
2.20.1

Re: [OE-core] [PATCH 33/36] expect: do not install examples, drop related patch

[Khem Raj]

On 11/17/21 7:35 AM, Alexander Kanavin wrote:
> There is really no reason to install them; this was done
> in the original recipe submission for unexplained reasons.

yes perhaps as part of main PN package its not but as a separate package 
something like PN-examples or some such it will be better

> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>   .../expect/expect/01-example-shebang.patch    | 144 ------------------
>   meta/recipes-devtools/expect/expect_5.45.4.bb |   2 -
>   2 files changed, 146 deletions(-)
>   delete mode 100644 meta/recipes-devtools/expect/expect/01-example-shebang.patch
> 
> diff --git a/meta/recipes-devtools/expect/expect/01-example-shebang.patch b/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> deleted file mode 100644
> index 8597f31387..0000000000
> --- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> +++ /dev/null
> @@ -1,144 +0,0 @@
> -Author: Mike Markley <mike@markley.org>
> -Author: Sergei Golovan <sgolovan@debian.org>
> -Description: Fixes shebangs in examples (Closes: #152367).
> -
> -Backported from Debian
> -
> -Upstream-Status: Pending
> -Index: expect5.45/example/beer.exp
> -===================================================================
> ---- expect5.45.orig/example/beer.exp	2006-01-25 13:51:39.000000000 -0800
> -+++ expect5.45/example/beer.exp	2013-11-01 17:35:19.817318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect -f
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # 99 bottles of beer on the wall, Expect-style
> - # Author: Don Libes <libes@nist.gov>
> -Index: expect5.45/example/expectd.proto
> -===================================================================
> ---- expect5.45.orig/example/expectd.proto	2010-07-02 09:03:31.000000000 -0700
> -+++ expect5.45/example/expectd.proto	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,10 @@
> --#!/depot/tcl/src/expect/e --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -+
> - # Description: Simple fragment to begin a telnet daemon
> - # For more information, see Chapter 17 of "Exploring Expect"
> - # Author: Don Libes, NIST
> -Index: expect5.45/example/irsh
> -===================================================================
> ---- expect5.45.orig/example/irsh	2010-07-02 09:03:31.000000000 -0700
> -+++ expect5.45/example/irsh	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # Do rsh interactively.  For example, consider the following command:
> - #    rsh <remote> ls -l "|" more
> -Index: expect5.45/example/passwd.cgi
> -===================================================================
> ---- expect5.45.orig/example/passwd.cgi	2000-01-06 15:22:07.000000000 -0800
> -+++ expect5.45/example/passwd.cgi	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # This is a CGI script to process requests created by the accompanying
> - # passwd.html form.  This script is pretty basic, although it is
> -Index: expect5.45/example/passwdprompt
> -===================================================================
> ---- expect5.45.orig/example/passwdprompt	2003-09-05 12:01:59.000000000 -0700
> -+++ expect5.45/example/passwdprompt	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # This script prompts for a passwd from stdin while echoing *'s
> -
> -Index: expect5.45/example/reprompt
> -===================================================================
> ---- expect5.45.orig/example/reprompt	2000-01-06 15:22:07.000000000 -0800
> -+++ expect5.45/example/reprompt	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # Name: reprompt
> - # Description: reprompt every so often until user enters something
> -Index: expect5.45/example/term_expect
> -===================================================================
> ---- expect5.45.orig/example/term_expect	2005-02-15 10:11:31.000000000 -0800
> -+++ expect5.45/example/term_expect	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expectk
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec wish "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> - # Name: tkterm - terminal emulator using Expect and Tk text widget, v3.0
> - # Author: Don Libes, July '94
> -Index: expect5.45/example/vrfy
> -===================================================================
> ---- expect5.45.orig/example/vrfy	2010-07-02 09:03:31.000000000 -0700
> -+++ expect5.45/example/vrfy	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,9 @@
> --#!/depot/path/expect -f
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -
> -
> - # separate address into user and host
> -Index: expect5.45/example/xrlogin
> -===================================================================
> ---- expect5.45.orig/example/xrlogin	2000-01-06 15:22:08.000000000 -0800
> -+++ expect5.45/example/xrlogin	2013-11-01 17:35:19.821318341 -0700
> -@@ -1,4 +1,10 @@
> --#!/depot/path/expect --
> -+#!/bin/sh
> -+# -*- tcl -*-
> -+# The next line is executed by /bin/sh, but not tcl \
> -+exec tclsh "$0" ${1+"$@"}
> -+
> -+package require Expect
> -+
> - # xrlogin - rlogin but with current DISPLAY
> - #
> - # You can extend this idea to save any arbitrary information across rlogin
> diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
> index e27b0d9d71..4214ab0f27 100644
> --- a/meta/recipes-devtools/expect/expect_5.45.4.bb
> +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
> @@ -21,7 +21,6 @@ inherit autotools update-alternatives
>   SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
>              file://0001-configure.in.patch \
>              file://0002-tcl.m4.patch \
> -           file://01-example-shebang.patch \
>              file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
>              file://0001-Resolve-string-formatting-issues.patch \
>              file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
> @@ -39,7 +38,6 @@ do_install:append() {
>   	install -d ${D}${libdir}
>           install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so   ${D}${libdir}/
>           install -m 0755 ${S}/fixline1           ${D}${libdir}/expect${PV}/
> -        install -m 0755 ${S}/example/*          ${D}${libdir}/expect${PV}/
>           rm ${D}${libdir}/expect${PV}/libexpect*.so
>           sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
>   }
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#158428): https://lists.openembedded.org/g/openembedded-core/message/158428
> Mute This Topic: https://lists.openembedded.org/mt/87122010/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 33/36] expect: do not install examples, drop related patch

[Alexander Kanavin]

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

On Wed, 17 Nov 2021 at 20:05, Khem Raj <raj.khem@gmail.com> wrote:

> yes perhaps as part of main PN package its not but as a separate package
> something like PN-examples or some such it will be better
>

If upstream doesn't install them, there's no need to override that; they're
just example code snippets that serve no purpose on embedded targets.

Alex



>
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >   .../expect/expect/01-example-shebang.patch    | 144 ------------------
> >   meta/recipes-devtools/expect/expect_5.45.4.bb |   2 -
> >   2 files changed, 146 deletions(-)
> >   delete mode 100644
> meta/recipes-devtools/expect/expect/01-example-shebang.patch
> >
> > diff --git
> a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> b/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> > deleted file mode 100644
> > index 8597f31387..0000000000
> > --- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
> > +++ /dev/null
> > @@ -1,144 +0,0 @@
> > -Author: Mike Markley <mike@markley.org>
> > -Author: Sergei Golovan <sgolovan@debian.org>
> > -Description: Fixes shebangs in examples (Closes: #152367).
> > -
> > -Backported from Debian
> > -
> > -Upstream-Status: Pending
> > -Index: expect5.45/example/beer.exp
> > -===================================================================
> > ---- expect5.45.orig/example/beer.exp 2006-01-25 13:51:39.000000000 -0800
> > -+++ expect5.45/example/beer.exp      2013-11-01 17:35:19.817318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect -f
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # 99 bottles of beer on the wall, Expect-style
> > - # Author: Don Libes <libes@nist.gov>
> > -Index: expect5.45/example/expectd.proto
> > -===================================================================
> > ---- expect5.45.orig/example/expectd.proto    2010-07-02
> 09:03:31.000000000 -0700
> > -+++ expect5.45/example/expectd.proto 2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,10 @@
> > --#!/depot/tcl/src/expect/e --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -+
> > - # Description: Simple fragment to begin a telnet daemon
> > - # For more information, see Chapter 17 of "Exploring Expect"
> > - # Author: Don Libes, NIST
> > -Index: expect5.45/example/irsh
> > -===================================================================
> > ---- expect5.45.orig/example/irsh     2010-07-02 09:03:31.000000000 -0700
> > -+++ expect5.45/example/irsh  2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # Do rsh interactively.  For example, consider the following command:
> > - #    rsh <remote> ls -l "|" more
> > -Index: expect5.45/example/passwd.cgi
> > -===================================================================
> > ---- expect5.45.orig/example/passwd.cgi       2000-01-06
> 15:22:07.000000000 -0800
> > -+++ expect5.45/example/passwd.cgi    2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # This is a CGI script to process requests created by the accompanying
> > - # passwd.html form.  This script is pretty basic, although it is
> > -Index: expect5.45/example/passwdprompt
> > -===================================================================
> > ---- expect5.45.orig/example/passwdprompt     2003-09-05
> 12:01:59.000000000 -0700
> > -+++ expect5.45/example/passwdprompt  2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # This script prompts for a passwd from stdin while echoing *'s
> > -
> > -Index: expect5.45/example/reprompt
> > -===================================================================
> > ---- expect5.45.orig/example/reprompt 2000-01-06 15:22:07.000000000 -0800
> > -+++ expect5.45/example/reprompt      2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # Name: reprompt
> > - # Description: reprompt every so often until user enters something
> > -Index: expect5.45/example/term_expect
> > -===================================================================
> > ---- expect5.45.orig/example/term_expect      2005-02-15
> 10:11:31.000000000 -0800
> > -+++ expect5.45/example/term_expect   2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expectk
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec wish "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > - # Name: tkterm - terminal emulator using Expect and Tk text widget,
> v3.0
> > - # Author: Don Libes, July '94
> > -Index: expect5.45/example/vrfy
> > -===================================================================
> > ---- expect5.45.orig/example/vrfy     2010-07-02 09:03:31.000000000 -0700
> > -+++ expect5.45/example/vrfy  2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,9 @@
> > --#!/depot/path/expect -f
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -
> > -
> > - # separate address into user and host
> > -Index: expect5.45/example/xrlogin
> > -===================================================================
> > ---- expect5.45.orig/example/xrlogin  2000-01-06 15:22:08.000000000 -0800
> > -+++ expect5.45/example/xrlogin       2013-11-01 17:35:19.821318341 -0700
> > -@@ -1,4 +1,10 @@
> > --#!/depot/path/expect --
> > -+#!/bin/sh
> > -+# -*- tcl -*-
> > -+# The next line is executed by /bin/sh, but not tcl \
> > -+exec tclsh "$0" ${1+"$@"}
> > -+
> > -+package require Expect
> > -+
> > - # xrlogin - rlogin but with current DISPLAY
> > - #
> > - # You can extend this idea to save any arbitrary information across
> rlogin
> > diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb
> b/meta/recipes-devtools/expect/expect_5.45.4.bb
> > index e27b0d9d71..4214ab0f27 100644
> > --- a/meta/recipes-devtools/expect/expect_5.45.4.bb
> > +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
> > @@ -21,7 +21,6 @@ inherit autotools update-alternatives
> >   SRC_URI =
> "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
> >              file://0001-configure.in.patch \
> >              file://0002-tcl.m4.patch \
> > -           file://01-example-shebang.patch \
> >
> file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
> >              file://0001-Resolve-string-formatting-issues.patch \
> >
> file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
> > @@ -39,7 +38,6 @@ do_install:append() {
> >       install -d ${D}${libdir}
> >           install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so
>  ${D}${libdir}/
> >           install -m 0755 ${S}/fixline1
>  ${D}${libdir}/expect${PV}/
> > -        install -m 0755 ${S}/example/*
> ${D}${libdir}/expect${PV}/
> >           rm ${D}${libdir}/expect${PV}/libexpect*.so
> >           sed -e 's|$dir|${libdir}|' -i
> ${D}${libdir}/expect${PV}/pkgIndex.tcl
> >   }
> >
> >
> >
> >
> >
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#158455):
> https://lists.openembedded.org/g/openembedded-core/message/158455
> Mute This Topic: https://lists.openembedded.org/mt/87122010/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: 11473 bytes --]

Re: [OE-core] [PATCH 33/36] expect: do not install examples, drop related patch

[Khem Raj]

On Wed, Nov 17, 2021 at 2:00 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> On Wed, 17 Nov 2021 at 20:05, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> yes perhaps as part of main PN package its not but as a separate package
>> something like PN-examples or some such it will be better
>
>
> If upstream doesn't install them, there's no need to override that; they're just example code snippets that serve no purpose on embedded targets.
>

Yes examples perhaps can be removed, thats perhaps fine, atleast its
clear change if someone needs to re-introduce it.
separately when looking at code I do see examples/ as folder being
referenced for EXECSCRIPTDIR and SCRIPTDIR in exp_main_sub.c
 that sounds interesting, hopefully not an issue but worth checking

> Alex
>
>
>>
>>
>> >
>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > ---
>> >   .../expect/expect/01-example-shebang.patch    | 144 ------------------
>> >   meta/recipes-devtools/expect/expect_5.45.4.bb |   2 -
>> >   2 files changed, 146 deletions(-)
>> >   delete mode 100644 meta/recipes-devtools/expect/expect/01-example-shebang.patch
>> >
>> > diff --git a/meta/recipes-devtools/expect/expect/01-example-shebang.patch b/meta/recipes-devtools/expect/expect/01-example-shebang.patch
>> > deleted file mode 100644
>> > index 8597f31387..0000000000
>> > --- a/meta/recipes-devtools/expect/expect/01-example-shebang.patch
>> > +++ /dev/null
>> > @@ -1,144 +0,0 @@
>> > -Author: Mike Markley <mike@markley.org>
>> > -Author: Sergei Golovan <sgolovan@debian.org>
>> > -Description: Fixes shebangs in examples (Closes: #152367).
>> > -
>> > -Backported from Debian
>> > -
>> > -Upstream-Status: Pending
>> > -Index: expect5.45/example/beer.exp
>> > -===================================================================
>> > ---- expect5.45.orig/example/beer.exp 2006-01-25 13:51:39.000000000 -0800
>> > -+++ expect5.45/example/beer.exp      2013-11-01 17:35:19.817318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect -f
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # 99 bottles of beer on the wall, Expect-style
>> > - # Author: Don Libes <libes@nist.gov>
>> > -Index: expect5.45/example/expectd.proto
>> > -===================================================================
>> > ---- expect5.45.orig/example/expectd.proto    2010-07-02 09:03:31.000000000 -0700
>> > -+++ expect5.45/example/expectd.proto 2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,10 @@
>> > --#!/depot/tcl/src/expect/e --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -+
>> > - # Description: Simple fragment to begin a telnet daemon
>> > - # For more information, see Chapter 17 of "Exploring Expect"
>> > - # Author: Don Libes, NIST
>> > -Index: expect5.45/example/irsh
>> > -===================================================================
>> > ---- expect5.45.orig/example/irsh     2010-07-02 09:03:31.000000000 -0700
>> > -+++ expect5.45/example/irsh  2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # Do rsh interactively.  For example, consider the following command:
>> > - #    rsh <remote> ls -l "|" more
>> > -Index: expect5.45/example/passwd.cgi
>> > -===================================================================
>> > ---- expect5.45.orig/example/passwd.cgi       2000-01-06 15:22:07.000000000 -0800
>> > -+++ expect5.45/example/passwd.cgi    2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # This is a CGI script to process requests created by the accompanying
>> > - # passwd.html form.  This script is pretty basic, although it is
>> > -Index: expect5.45/example/passwdprompt
>> > -===================================================================
>> > ---- expect5.45.orig/example/passwdprompt     2003-09-05 12:01:59.000000000 -0700
>> > -+++ expect5.45/example/passwdprompt  2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # This script prompts for a passwd from stdin while echoing *'s
>> > -
>> > -Index: expect5.45/example/reprompt
>> > -===================================================================
>> > ---- expect5.45.orig/example/reprompt 2000-01-06 15:22:07.000000000 -0800
>> > -+++ expect5.45/example/reprompt      2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # Name: reprompt
>> > - # Description: reprompt every so often until user enters something
>> > -Index: expect5.45/example/term_expect
>> > -===================================================================
>> > ---- expect5.45.orig/example/term_expect      2005-02-15 10:11:31.000000000 -0800
>> > -+++ expect5.45/example/term_expect   2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expectk
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec wish "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > - # Name: tkterm - terminal emulator using Expect and Tk text widget, v3.0
>> > - # Author: Don Libes, July '94
>> > -Index: expect5.45/example/vrfy
>> > -===================================================================
>> > ---- expect5.45.orig/example/vrfy     2010-07-02 09:03:31.000000000 -0700
>> > -+++ expect5.45/example/vrfy  2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,9 @@
>> > --#!/depot/path/expect -f
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -
>> > -
>> > - # separate address into user and host
>> > -Index: expect5.45/example/xrlogin
>> > -===================================================================
>> > ---- expect5.45.orig/example/xrlogin  2000-01-06 15:22:08.000000000 -0800
>> > -+++ expect5.45/example/xrlogin       2013-11-01 17:35:19.821318341 -0700
>> > -@@ -1,4 +1,10 @@
>> > --#!/depot/path/expect --
>> > -+#!/bin/sh
>> > -+# -*- tcl -*-
>> > -+# The next line is executed by /bin/sh, but not tcl \
>> > -+exec tclsh "$0" ${1+"$@"}
>> > -+
>> > -+package require Expect
>> > -+
>> > - # xrlogin - rlogin but with current DISPLAY
>> > - #
>> > - # You can extend this idea to save any arbitrary information across rlogin
>> > diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
>> > index e27b0d9d71..4214ab0f27 100644
>> > --- a/meta/recipes-devtools/expect/expect_5.45.4.bb
>> > +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
>> > @@ -21,7 +21,6 @@ inherit autotools update-alternatives
>> >   SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
>> >              file://0001-configure.in.patch \
>> >              file://0002-tcl.m4.patch \
>> > -           file://01-example-shebang.patch \
>> >              file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
>> >              file://0001-Resolve-string-formatting-issues.patch \
>> >              file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
>> > @@ -39,7 +38,6 @@ do_install:append() {
>> >       install -d ${D}${libdir}
>> >           install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so   ${D}${libdir}/
>> >           install -m 0755 ${S}/fixline1           ${D}${libdir}/expect${PV}/
>> > -        install -m 0755 ${S}/example/*          ${D}${libdir}/expect${PV}/
>> >           rm ${D}${libdir}/expect${PV}/libexpect*.so
>> >           sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
>> >   }
>> >
>> >
>> >
>> >
>> >
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#158455): https://lists.openembedded.org/g/openembedded-core/message/158455
>> Mute This Topic: https://lists.openembedded.org/mt/87122010/1686489
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>

[PATCH 34/36] busybox: drop 0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch

[Alexander Kanavin]

This was added 10 years ago, is almost certainly non-upstreamable
and it isn't clear what the issues it aims to fix are:
the AB revealed no problems when the patch is removed.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ing-instead-of-LD-and-use-CFLAGS-and.patch | 114 ------------------
 meta/recipes-core/busybox/busybox_1.34.1.bb   |   1 -
 2 files changed, 115 deletions(-)
 delete mode 100644 meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch

diff --git a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch b/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
deleted file mode 100644
index 2bf2b91c7e..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From a9333eb6a7b8dbda735947cd5bc981ff9352a2c9 Mon Sep 17 00:00:00 2001
-From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Date: Thu, 10 Mar 2011 00:27:08 -0500
-Subject: [PATCH 1/2] Use $(CC) when linking instead of $(LD) and use $(CFLAGS)
- and $(EXTRA_CFLAGS) when linking.
-
-This fixes the issue where LDFLAGS escaped with -Wl are ignored during
-compilation. It also simplifies using CFLAGS or EXTRA_CFLAGS (such as
--m32 on x86_64 or -flto) which apply to both compilation and linking
-situations.
-
-Signed-off-by: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
----
-Upstream-Status: Pending
-
- Makefile               |  7 ++++---
- scripts/Makefile.build |  8 ++++----
- scripts/Makefile.lib   | 13 +++----------
- 3 files changed, 11 insertions(+), 17 deletions(-)
-
-Index: busybox-1.23.2/Makefile
-===================================================================
---- busybox-1.23.2.orig/Makefile
-+++ busybox-1.23.2/Makefile
-@@ -309,7 +309,8 @@ CHECKFLAGS     := -D__linux__ -Dlinux -D
- MODFLAGS	= -DMODULE
- CFLAGS_MODULE   = $(MODFLAGS)
- AFLAGS_MODULE   = $(MODFLAGS)
--LDFLAGS_MODULE  = -r
-+LDFLAGS_RELOCATABLE = -r -nostdlib
-+LDFLAGS_MODULE  = $(LDFLAGS_RELOCATABLE)
- CFLAGS_KERNEL	=
- AFLAGS_KERNEL	=
- 
-@@ -331,7 +332,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL)
- export	VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
- 	ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
- 	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \
--	HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
-+	HOSTCXX HOSTCXXFLAGS LDFLAGS_RELOCATABLE LDFLAGS_MODULE CHECK CHECKFLAGS
- 
- export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
- export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
-@@ -610,7 +611,7 @@ quiet_cmd_busybox__ ?= LINK    $@
-       cmd_busybox__ ?= $(srctree)/scripts/trylink \
-       "$@" \
-       "$(CC)" \
--      "$(CFLAGS) $(CFLAGS_busybox)" \
-+      "$(CFLAGS) $(CFLAGS_busybox) $(EXTRA_CFLAGS)" \
-       "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
-       "$(core-y)" \
-       "$(libs-y)" \
-Index: busybox-1.23.2/scripts/Makefile.build
-===================================================================
---- busybox-1.23.2.orig/scripts/Makefile.build
-+++ busybox-1.23.2/scripts/Makefile.build
-@@ -174,7 +174,7 @@ cmd_modversions =							\
- 		| $(GENKSYMS) -a $(ARCH)				\
- 		> $(@D)/.tmp_$(@F:.o=.ver);				\
- 									\
--		$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		\
-+               $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@ $(@D)/.tmp_$(@F)        \
- 			-T $(@D)/.tmp_$(@F:.o=.ver);			\
- 		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);	\
- 	else								\
-@@ -257,7 +257,7 @@ quiet_cmd_link_o_target = LD      $@
- # If the list of objects to link is empty, just create an empty built-in.o
- # -nostdlib is added to make "make LD=gcc ..." work (some people use that)
- cmd_link_o_target = $(if $(strip $(obj-y)),\
--		$(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
-+		$(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@ $(filter $(obj-y), $^),\
- 		rm -f $@; $(AR) rcs $@)
- 
- $(builtin-target): $(obj-y) FORCE
-@@ -292,10 +292,10 @@ $($(subst $(obj)/,,$(@:.o=-objs)))    \
- $($(subst $(obj)/,,$(@:.o=-y)))), $^)
- 
- quiet_cmd_link_multi-y = LD      $@
--cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
-+cmd_link_multi-y = $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@ $(link_multi_deps)
- 
- quiet_cmd_link_multi-m = LD [M]  $@
--cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
-+cmd_link_multi-m = $(CC) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
- 
- # We would rather have a list of rules like
- # 	foo.o: $(foo-objs)
-Index: busybox-1.23.2/scripts/Makefile.lib
-===================================================================
---- busybox-1.23.2.orig/scripts/Makefile.lib
-+++ busybox-1.23.2/scripts/Makefile.lib
-@@ -121,7 +121,8 @@ cpp_flags      = -Wp,-MD,$(depfile) $(NO
- # yet ld_flags is fed to ld.
- #ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
- # Remove the -Wl, prefix from linker options normally passed through gcc
--ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS))
-+ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS) $(CFLAGS) $(EXTRA_CFLAGS))
-+ld_flags_partial = $($(filter-out -shared%, $(filter-out -pie%,$(ld_flags))))
- 
- 
- # Finds the multi-part object the current object will be linked into
-@@ -151,10 +152,8 @@ $(obj)/%:: $(src)/%_shipped
- # Linking
- # ---------------------------------------------------------------------------
- 
--# TODO: LDFLAGS usually is supposed to contain gcc's flags, not ld's.
--# but here we feed them to ld!
--quiet_cmd_ld = LD      $@
--cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
-+quiet_cmd_ld = CC    $@
-+cmd_ld = $(CC) $(ld_flags) $(LDFLAGS_$(@F)) \
- 	       $(filter-out FORCE,$^) -o $@
- 
- # Objcopy
diff --git a/meta/recipes-core/busybox/busybox_1.34.1.bb b/meta/recipes-core/busybox/busybox_1.34.1.bb
index 6aed0f0476..3651c06126 100644
--- a/meta/recipes-core/busybox/busybox_1.34.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.34.1.bb
@@ -26,7 +26,6 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://login-utilities.cfg \
            file://recognize_connmand.patch \
            file://busybox-cross-menuconfig.patch \
-           file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
            file://mount-via-label.cfg \
            file://sha1sum.cfg \
            file://sha256sum.cfg \
-- 
2.20.1

Re: [OE-core] [PATCH 34/36] busybox: drop 0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch

[Andre McCurdy]

On Wed, Nov 17, 2021 at 7:36 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> This was added 10 years ago, is almost certainly non-upstreamable
> and it isn't clear what the issues it aims to fix are:
> the AB revealed no problems when the patch is removed.

The comment in the patch was: This fixes the issue where LDFLAGS
escaped with -Wl are ignored during compilation. Seems fairly clear!

Checking that the AB run didn't fail is probably not enough to justify
removing this patch. You should also confirm that LDFLAGS escaped with
-Wl (e.g. -Wl,-z,relro,-z,now when security flags are enabled, etc)
are still passed to the linker.

> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...ing-instead-of-LD-and-use-CFLAGS-and.patch | 114 ------------------
>  meta/recipes-core/busybox/busybox_1.34.1.bb   |   1 -
>  2 files changed, 115 deletions(-)
>  delete mode 100644 meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
>
> diff --git a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch b/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
> deleted file mode 100644
> index 2bf2b91c7e..0000000000
> --- a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
> +++ /dev/null
> @@ -1,114 +0,0 @@
> -From a9333eb6a7b8dbda735947cd5bc981ff9352a2c9 Mon Sep 17 00:00:00 2001
> -From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
> -Date: Thu, 10 Mar 2011 00:27:08 -0500
> -Subject: [PATCH 1/2] Use $(CC) when linking instead of $(LD) and use $(CFLAGS)
> - and $(EXTRA_CFLAGS) when linking.
> -
> -This fixes the issue where LDFLAGS escaped with -Wl are ignored during
> -compilation. It also simplifies using CFLAGS or EXTRA_CFLAGS (such as
> --m32 on x86_64 or -flto) which apply to both compilation and linking
> -situations.
> -
> -Signed-off-by: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
> ----
> -Upstream-Status: Pending
> -
> - Makefile               |  7 ++++---
> - scripts/Makefile.build |  8 ++++----
> - scripts/Makefile.lib   | 13 +++----------
> - 3 files changed, 11 insertions(+), 17 deletions(-)
> -
> -Index: busybox-1.23.2/Makefile
> -===================================================================
> ---- busybox-1.23.2.orig/Makefile
> -+++ busybox-1.23.2/Makefile
> -@@ -309,7 +309,8 @@ CHECKFLAGS     := -D__linux__ -Dlinux -D
> - MODFLAGS      = -DMODULE
> - CFLAGS_MODULE   = $(MODFLAGS)
> - AFLAGS_MODULE   = $(MODFLAGS)
> --LDFLAGS_MODULE  = -r
> -+LDFLAGS_RELOCATABLE = -r -nostdlib
> -+LDFLAGS_MODULE  = $(LDFLAGS_RELOCATABLE)
> - CFLAGS_KERNEL =
> - AFLAGS_KERNEL =
> -
> -@@ -331,7 +332,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL)
> - export        VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
> -       ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
> -       CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \
> --      HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
> -+      HOSTCXX HOSTCXXFLAGS LDFLAGS_RELOCATABLE LDFLAGS_MODULE CHECK CHECKFLAGS
> -
> - export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
> - export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
> -@@ -610,7 +611,7 @@ quiet_cmd_busybox__ ?= LINK    $@
> -       cmd_busybox__ ?= $(srctree)/scripts/trylink \
> -       "$@" \
> -       "$(CC)" \
> --      "$(CFLAGS) $(CFLAGS_busybox)" \
> -+      "$(CFLAGS) $(CFLAGS_busybox) $(EXTRA_CFLAGS)" \
> -       "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
> -       "$(core-y)" \
> -       "$(libs-y)" \
> -Index: busybox-1.23.2/scripts/Makefile.build
> -===================================================================
> ---- busybox-1.23.2.orig/scripts/Makefile.build
> -+++ busybox-1.23.2/scripts/Makefile.build
> -@@ -174,7 +174,7 @@ cmd_modversions =                                                  \
> -               | $(GENKSYMS) -a $(ARCH)                                \
> -               > $(@D)/.tmp_$(@F:.o=.ver);                             \
> -                                                                       \
> --              $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)              \
> -+               $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@ $(@D)/.tmp_$(@F)        \
> -                       -T $(@D)/.tmp_$(@F:.o=.ver);                    \
> -               rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);        \
> -       else                                                            \
> -@@ -257,7 +257,7 @@ quiet_cmd_link_o_target = LD      $@
> - # If the list of objects to link is empty, just create an empty built-in.o
> - # -nostdlib is added to make "make LD=gcc ..." work (some people use that)
> - cmd_link_o_target = $(if $(strip $(obj-y)),\
> --              $(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
> -+              $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@ $(filter $(obj-y), $^),\
> -               rm -f $@; $(AR) rcs $@)
> -
> - $(builtin-target): $(obj-y) FORCE
> -@@ -292,10 +292,10 @@ $($(subst $(obj)/,,$(@:.o=-objs)))    \
> - $($(subst $(obj)/,,$(@:.o=-y)))), $^)
> -
> - quiet_cmd_link_multi-y = LD      $@
> --cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
> -+cmd_link_multi-y = $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@ $(link_multi_deps)
> -
> - quiet_cmd_link_multi-m = LD [M]  $@
> --cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
> -+cmd_link_multi-m = $(CC) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
> -
> - # We would rather have a list of rules like
> - #     foo.o: $(foo-objs)
> -Index: busybox-1.23.2/scripts/Makefile.lib
> -===================================================================
> ---- busybox-1.23.2.orig/scripts/Makefile.lib
> -+++ busybox-1.23.2/scripts/Makefile.lib
> -@@ -121,7 +121,8 @@ cpp_flags      = -Wp,-MD,$(depfile) $(NO
> - # yet ld_flags is fed to ld.
> - #ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
> - # Remove the -Wl, prefix from linker options normally passed through gcc
> --ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS))
> -+ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS) $(CFLAGS) $(EXTRA_CFLAGS))
> -+ld_flags_partial = $($(filter-out -shared%, $(filter-out -pie%,$(ld_flags))))
> -
> -
> - # Finds the multi-part object the current object will be linked into
> -@@ -151,10 +152,8 @@ $(obj)/%:: $(src)/%_shipped
> - # Linking
> - # ---------------------------------------------------------------------------
> -
> --# TODO: LDFLAGS usually is supposed to contain gcc's flags, not ld's.
> --# but here we feed them to ld!
> --quiet_cmd_ld = LD      $@
> --cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
> -+quiet_cmd_ld = CC    $@
> -+cmd_ld = $(CC) $(ld_flags) $(LDFLAGS_$(@F)) \
> -              $(filter-out FORCE,$^) -o $@
> -
> - # Objcopy
> diff --git a/meta/recipes-core/busybox/busybox_1.34.1.bb b/meta/recipes-core/busybox/busybox_1.34.1.bb
> index 6aed0f0476..3651c06126 100644
> --- a/meta/recipes-core/busybox/busybox_1.34.1.bb
> +++ b/meta/recipes-core/busybox/busybox_1.34.1.bb
> @@ -26,7 +26,6 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
>             file://login-utilities.cfg \
>             file://recognize_connmand.patch \
>             file://busybox-cross-menuconfig.patch \
> -           file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
>             file://mount-via-label.cfg \
>             file://sha1sum.cfg \
>             file://sha256sum.cfg \
> --
> 2.20.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#158429): https://lists.openembedded.org/g/openembedded-core/message/158429
> Mute This Topic: https://lists.openembedded.org/mt/87122011/3619030
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [armccurdy@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [OE-core] [PATCH 34/36] busybox: drop 0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch

[Alexander Kanavin]

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

On Wed, 17 Nov 2021 at 21:43, Andre McCurdy <armccurdy@gmail.com> wrote:

> On Wed, Nov 17, 2021 at 7:36 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > This was added 10 years ago, is almost certainly non-upstreamable
> > and it isn't clear what the issues it aims to fix are:
> > the AB revealed no problems when the patch is removed.
>
> The comment in the patch was: This fixes the issue where LDFLAGS
> escaped with -Wl are ignored during compilation. Seems fairly clear!
>
> Checking that the AB run didn't fail is probably not enough to justify
> removing this patch. You should also confirm that LDFLAGS escaped with
> -Wl (e.g. -Wl,-z,relro,-z,now when security flags are enabled, etc)
> are still passed to the linker.
>

Thanks, I will double check.

Alex


>
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  ...ing-instead-of-LD-and-use-CFLAGS-and.patch | 114 ------------------
> >  meta/recipes-core/busybox/busybox_1.34.1.bb   |   1 -
> >  2 files changed, 115 deletions(-)
> >  delete mode 100644
> meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
> >
> > diff --git
> a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
> b/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
> > deleted file mode 100644
> > index 2bf2b91c7e..0000000000
> > ---
> a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
> > +++ /dev/null
> > @@ -1,114 +0,0 @@
> > -From a9333eb6a7b8dbda735947cd5bc981ff9352a2c9 Mon Sep 17 00:00:00 2001
> > -From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
> > -Date: Thu, 10 Mar 2011 00:27:08 -0500
> > -Subject: [PATCH 1/2] Use $(CC) when linking instead of $(LD) and use
> $(CFLAGS)
> > - and $(EXTRA_CFLAGS) when linking.
> > -
> > -This fixes the issue where LDFLAGS escaped with -Wl are ignored during
> > -compilation. It also simplifies using CFLAGS or EXTRA_CFLAGS (such as
> > --m32 on x86_64 or -flto) which apply to both compilation and linking
> > -situations.
> > -
> > -Signed-off-by: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
> > ----
> > -Upstream-Status: Pending
> > -
> > - Makefile               |  7 ++++---
> > - scripts/Makefile.build |  8 ++++----
> > - scripts/Makefile.lib   | 13 +++----------
> > - 3 files changed, 11 insertions(+), 17 deletions(-)
> > -
> > -Index: busybox-1.23.2/Makefile
> > -===================================================================
> > ---- busybox-1.23.2.orig/Makefile
> > -+++ busybox-1.23.2/Makefile
> > -@@ -309,7 +309,8 @@ CHECKFLAGS     := -D__linux__ -Dlinux -D
> > - MODFLAGS      = -DMODULE
> > - CFLAGS_MODULE   = $(MODFLAGS)
> > - AFLAGS_MODULE   = $(MODFLAGS)
> > --LDFLAGS_MODULE  = -r
> > -+LDFLAGS_RELOCATABLE = -r -nostdlib
> > -+LDFLAGS_MODULE  = $(LDFLAGS_RELOCATABLE)
> > - CFLAGS_KERNEL =
> > - AFLAGS_KERNEL =
> > -
> > -@@ -331,7 +332,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL)
> > - export        VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
> > -       ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
> > -       CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL
> UTS_MACHINE \
> > --      HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
> > -+      HOSTCXX HOSTCXXFLAGS LDFLAGS_RELOCATABLE LDFLAGS_MODULE CHECK
> CHECKFLAGS
> > -
> > - export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
> > - export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
> > -@@ -610,7 +611,7 @@ quiet_cmd_busybox__ ?= LINK    $@
> > -       cmd_busybox__ ?= $(srctree)/scripts/trylink \
> > -       "$@" \
> > -       "$(CC)" \
> > --      "$(CFLAGS) $(CFLAGS_busybox)" \
> > -+      "$(CFLAGS) $(CFLAGS_busybox) $(EXTRA_CFLAGS)" \
> > -       "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
> > -       "$(core-y)" \
> > -       "$(libs-y)" \
> > -Index: busybox-1.23.2/scripts/Makefile.build
> > -===================================================================
> > ---- busybox-1.23.2.orig/scripts/Makefile.build
> > -+++ busybox-1.23.2/scripts/Makefile.build
> > -@@ -174,7 +174,7 @@ cmd_modversions =
>                 \
> > -               | $(GENKSYMS) -a $(ARCH)                                \
> > -               > $(@D)/.tmp_$(@F:.o=.ver);                             \
> > -                                                                       \
> > --              $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)              \
> > -+               $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@
> $(@D)/.tmp_$(@F)        \
> > -                       -T $(@D)/.tmp_$(@F:.o=.ver);                    \
> > -               rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);        \
> > -       else                                                            \
> > -@@ -257,7 +257,7 @@ quiet_cmd_link_o_target = LD      $@
> > - # If the list of objects to link is empty, just create an empty
> built-in.o
> > - # -nostdlib is added to make "make LD=gcc ..." work (some people use
> that)
> > - cmd_link_o_target = $(if $(strip $(obj-y)),\
> > --              $(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y),
> $^),\
> > -+              $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@
> $(filter $(obj-y), $^),\
> > -               rm -f $@; $(AR) rcs $@)
> > -
> > - $(builtin-target): $(obj-y) FORCE
> > -@@ -292,10 +292,10 @@ $($(subst $(obj)/,,$(@:.o=-objs)))    \
> > - $($(subst $(obj)/,,$(@:.o=-y)))), $^)
> > -
> > - quiet_cmd_link_multi-y = LD      $@
> > --cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
> > -+cmd_link_multi-y = $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o
> $@ $(link_multi_deps)
> > -
> > - quiet_cmd_link_multi-m = LD [M]  $@
> > --cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@
> $(link_multi_deps)
> > -+cmd_link_multi-m = $(CC) $(ld_flags) $(LDFLAGS_MODULE) -o $@
> $(link_multi_deps)
> > -
> > - # We would rather have a list of rules like
> > - #     foo.o: $(foo-objs)
> > -Index: busybox-1.23.2/scripts/Makefile.lib
> > -===================================================================
> > ---- busybox-1.23.2.orig/scripts/Makefile.lib
> > -+++ busybox-1.23.2/scripts/Makefile.lib
> > -@@ -121,7 +121,8 @@ cpp_flags      = -Wp,-MD,$(depfile) $(NO
> > - # yet ld_flags is fed to ld.
> > - #ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
> > - # Remove the -Wl, prefix from linker options normally passed through
> gcc
> > --ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS))
> > -+ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS)
> $(CFLAGS) $(EXTRA_CFLAGS))
> > -+ld_flags_partial = $($(filter-out -shared%, $(filter-out
> -pie%,$(ld_flags))))
> > -
> > -
> > - # Finds the multi-part object the current object will be linked into
> > -@@ -151,10 +152,8 @@ $(obj)/%:: $(src)/%_shipped
> > - # Linking
> > - #
> ---------------------------------------------------------------------------
> > -
> > --# TODO: LDFLAGS usually is supposed to contain gcc's flags, not ld's.
> > --# but here we feed them to ld!
> > --quiet_cmd_ld = LD      $@
> > --cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
> > -+quiet_cmd_ld = CC    $@
> > -+cmd_ld = $(CC) $(ld_flags) $(LDFLAGS_$(@F)) \
> > -              $(filter-out FORCE,$^) -o $@
> > -
> > - # Objcopy
> > diff --git a/meta/recipes-core/busybox/busybox_1.34.1.bb
> b/meta/recipes-core/busybox/busybox_1.34.1.bb
> > index 6aed0f0476..3651c06126 100644
> > --- a/meta/recipes-core/busybox/busybox_1.34.1.bb
> > +++ b/meta/recipes-core/busybox/busybox_1.34.1.bb
> > @@ -26,7 +26,6 @@ SRC_URI = "
> https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
> >             file://login-utilities.cfg \
> >             file://recognize_connmand.patch \
> >             file://busybox-cross-menuconfig.patch \
> > -
>  file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
> >             file://mount-via-label.cfg \
> >             file://sha1sum.cfg \
> >             file://sha256sum.cfg \
> > --
> > 2.20.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#158429):
> https://lists.openembedded.org/g/openembedded-core/message/158429
> > Mute This Topic: https://lists.openembedded.org/mt/87122011/3619030
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> armccurdy@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>

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

Re: [OE-core] [PATCH 34/36] busybox: drop 0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch

[Alexander Kanavin]

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

I double checked, with strace (can't trust the logs as they don't show the
actual linker invocation :)

execve("/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc",
["x86_64-poky-linux-gcc", "-m64", "-march=core2", "-mtune=core2", "-msse3",
"-mfpmath=sse", "-fstack-protector-strong", "-O2", "-D_FORTIFY_SOURCE=2",
"--sysroot=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0/recipe-sysroot",
"-malign-data=abi", "-Wall", "-Wshadow", "-Wwrite-strings", "-Wundef",
"-Wstrict-prototypes", "-Wunused", "-Wunused-parameter",
"-Wunused-function", "-Wunused-value", "-Wmissing-prototypes",
"-Wmissing-declarations", "-Wno-format-security",
"-Wdeclaration-after-statement", "-Wold-style-definition",
"-finline-limit=0", "-fno-builtin-strlen", "-fomit-frame-pointer",
"-ffunction-sections", "-fdata-sections", "-fno-guess-branch-probability",
"-funsigned-char", "-static-libgcc", "-falign-functions=1",
"-falign-jumps=1", "-falign-labels=1", "-falign-loops=1",
"-fno-unwind-tables", "-fno-asynchronous-unwind-tables",
"-fno-builtin-printf", "-Os", "-O2", "-pipe", "-g",
"-feliminate-unused-debug-types", "-m64", "-march=core2", "-mtune=core2",
"-msse3", "-mfpmath=sse", "-fstack-protector-strong", "-O2",
"-D_FORTIFY_SOURCE=2", "-Wl,-O1", "-Wl,--hash-style=gnu",
"-Wl,--as-needed",
"-fmacro-prefix-map=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0=/usr/src/debug/busybox/1.34.1-r0",
"-fdebug-prefix-map=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0=/usr/src/debug/busybox/1.34.1-r0",
"-fdebug-prefix-map=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0/recipe-sysroot=",
"-fdebug-prefix-map=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0/recipe-sysroot-native=",
"-Wl,-z,relro,-z,now", "-o", "busybox_unstripped", "-Wl,--sort-common",
"-Wl,--sort-section,alignment", "-Wl,--gc-sections", "-Wl,--start-group",
"applets/built-in.o", "archival/lib.a", "archival/libarchive/lib.a",
"console-tools/lib.a", "coreutils/lib.a", "coreutils/libcoreutils/lib.a",
"debianutils/lib.a", "klibc-utils/lib.a", "e2fsprogs/lib.a",
"editors/lib.a", "findutils/lib.a", "init/lib.a", "libbb/lib.a",
"libpwdgrp/lib.a", "loginutils/lib.a", "mailutils/lib.a",
"miscutils/lib.a", "modutils/lib.a", "networking/lib.a",
"networking/libiproute/lib.a", "networking/udhcp/lib.a",
"printutils/lib.a", "procps/lib.a", "runit/lib.a", "selinux/lib.a",
"shell/lib.a", "sysklogd/lib.a", "util-linux/lib.a",
"util-linux/volume_id/lib.a", "archival/built-in.o",
"archival/libarchive/built-in.o", "console-tools/built-in.o",
"coreutils/built-in.o", "coreutils/libcoreutils/built-in.o",
"debianutils/built-in.o", "klibc-utils/built-in.o", "e2fsprogs/built-in.o",
"editors/built-in.o", "findutils/built-in.o", "init/built-in.o",
"libbb/built-in.o", "libpwdgrp/built-in.o", "loginutils/built-in.o",
"mailutils/built-in.o", "miscutils/built-in.o", "modutils/built-in.o",
"networking/built-in.o", "networking/libiproute/built-in.o",
"networking/udhcp/built-in.o", "printutils/built-in.o",
"procps/built-in.o", "runit/built-in.o", "selinux/built-in.o",
"shell/built-in.o", "sysklogd/built-in.o", "util-linux/built-in.o",
"util-linux/volume_id/built-in.o", "-Wl,--end-group", "-Wl,--start-group",
"-lcrypt", "-lm", "-lrt", "-Wl,--end-group"], 0x5654941e7a98 /* 138 vars
*/) = 0

So everything that is supposed to be there is actually present, and the
patch is indeed unneeded.

Alex

On Wed, 17 Nov 2021 at 23:05, Alexander Kanavin via lists.openembedded.org
<alex.kanavin=gmail.com@lists.openembedded.org> wrote:

> On Wed, 17 Nov 2021 at 21:43, Andre McCurdy <armccurdy@gmail.com> wrote:
>
>> On Wed, Nov 17, 2021 at 7:36 AM Alexander Kanavin
>> <alex.kanavin@gmail.com> wrote:
>> >
>> > This was added 10 years ago, is almost certainly non-upstreamable
>> > and it isn't clear what the issues it aims to fix are:
>> > the AB revealed no problems when the patch is removed.
>>
>> The comment in the patch was: This fixes the issue where LDFLAGS
>> escaped with -Wl are ignored during compilation. Seems fairly clear!
>>
>> Checking that the AB run didn't fail is probably not enough to justify
>> removing this patch. You should also confirm that LDFLAGS escaped with
>> -Wl (e.g. -Wl,-z,relro,-z,now when security flags are enabled, etc)
>> are still passed to the linker.
>>
>
> Thanks, I will double check.
>
> Alex
>
>
>>
>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > ---
>> >  ...ing-instead-of-LD-and-use-CFLAGS-and.patch | 114 ------------------
>> >  meta/recipes-core/busybox/busybox_1.34.1.bb   |   1 -
>> >  2 files changed, 115 deletions(-)
>> >  delete mode 100644
>> meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
>> >
>> > diff --git
>> a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
>> b/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
>> > deleted file mode 100644
>> > index 2bf2b91c7e..0000000000
>> > ---
>> a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
>> > +++ /dev/null
>> > @@ -1,114 +0,0 @@
>> > -From a9333eb6a7b8dbda735947cd5bc981ff9352a2c9 Mon Sep 17 00:00:00 2001
>> > -From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
>> > -Date: Thu, 10 Mar 2011 00:27:08 -0500
>> > -Subject: [PATCH 1/2] Use $(CC) when linking instead of $(LD) and use
>> $(CFLAGS)
>> > - and $(EXTRA_CFLAGS) when linking.
>> > -
>> > -This fixes the issue where LDFLAGS escaped with -Wl are ignored during
>> > -compilation. It also simplifies using CFLAGS or EXTRA_CFLAGS (such as
>> > --m32 on x86_64 or -flto) which apply to both compilation and linking
>> > -situations.
>> > -
>> > -Signed-off-by: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
>> > ----
>> > -Upstream-Status: Pending
>> > -
>> > - Makefile               |  7 ++++---
>> > - scripts/Makefile.build |  8 ++++----
>> > - scripts/Makefile.lib   | 13 +++----------
>> > - 3 files changed, 11 insertions(+), 17 deletions(-)
>> > -
>> > -Index: busybox-1.23.2/Makefile
>> > -===================================================================
>> > ---- busybox-1.23.2.orig/Makefile
>> > -+++ busybox-1.23.2/Makefile
>> > -@@ -309,7 +309,8 @@ CHECKFLAGS     := -D__linux__ -Dlinux -D
>> > - MODFLAGS      = -DMODULE
>> > - CFLAGS_MODULE   = $(MODFLAGS)
>> > - AFLAGS_MODULE   = $(MODFLAGS)
>> > --LDFLAGS_MODULE  = -r
>> > -+LDFLAGS_RELOCATABLE = -r -nostdlib
>> > -+LDFLAGS_MODULE  = $(LDFLAGS_RELOCATABLE)
>> > - CFLAGS_KERNEL =
>> > - AFLAGS_KERNEL =
>> > -
>> > -@@ -331,7 +332,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL)
>> > - export        VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
>> \
>> > -       ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
>> > -       CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL
>> UTS_MACHINE \
>> > --      HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
>> > -+      HOSTCXX HOSTCXXFLAGS LDFLAGS_RELOCATABLE LDFLAGS_MODULE CHECK
>> CHECKFLAGS
>> > -
>> > - export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
>> > - export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
>> > -@@ -610,7 +611,7 @@ quiet_cmd_busybox__ ?= LINK    $@
>> > -       cmd_busybox__ ?= $(srctree)/scripts/trylink \
>> > -       "$@" \
>> > -       "$(CC)" \
>> > --      "$(CFLAGS) $(CFLAGS_busybox)" \
>> > -+      "$(CFLAGS) $(CFLAGS_busybox) $(EXTRA_CFLAGS)" \
>> > -       "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
>> > -       "$(core-y)" \
>> > -       "$(libs-y)" \
>> > -Index: busybox-1.23.2/scripts/Makefile.build
>> > -===================================================================
>> > ---- busybox-1.23.2.orig/scripts/Makefile.build
>> > -+++ busybox-1.23.2/scripts/Makefile.build
>> > -@@ -174,7 +174,7 @@ cmd_modversions =
>>                 \
>> > -               | $(GENKSYMS) -a $(ARCH)
>> \
>> > -               > $(@D)/.tmp_$(@F:.o=.ver);
>>  \
>> > -
>>  \
>> > --              $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)
>> \
>> > -+               $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@
>> $(@D)/.tmp_$(@F)        \
>> > -                       -T $(@D)/.tmp_$(@F:.o=.ver);
>> \
>> > -               rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);
>> \
>> > -       else
>> \
>> > -@@ -257,7 +257,7 @@ quiet_cmd_link_o_target = LD      $@
>> > - # If the list of objects to link is empty, just create an empty
>> built-in.o
>> > - # -nostdlib is added to make "make LD=gcc ..." work (some people use
>> that)
>> > - cmd_link_o_target = $(if $(strip $(obj-y)),\
>> > --              $(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y),
>> $^),\
>> > -+              $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@
>> $(filter $(obj-y), $^),\
>> > -               rm -f $@; $(AR) rcs $@)
>> > -
>> > - $(builtin-target): $(obj-y) FORCE
>> > -@@ -292,10 +292,10 @@ $($(subst $(obj)/,,$(@:.o=-objs)))    \
>> > - $($(subst $(obj)/,,$(@:.o=-y)))), $^)
>> > -
>> > - quiet_cmd_link_multi-y = LD      $@
>> > --cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
>> > -+cmd_link_multi-y = $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE)
>> -o $@ $(link_multi_deps)
>> > -
>> > - quiet_cmd_link_multi-m = LD [M]  $@
>> > --cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@
>> $(link_multi_deps)
>> > -+cmd_link_multi-m = $(CC) $(ld_flags) $(LDFLAGS_MODULE) -o $@
>> $(link_multi_deps)
>> > -
>> > - # We would rather have a list of rules like
>> > - #     foo.o: $(foo-objs)
>> > -Index: busybox-1.23.2/scripts/Makefile.lib
>> > -===================================================================
>> > ---- busybox-1.23.2.orig/scripts/Makefile.lib
>> > -+++ busybox-1.23.2/scripts/Makefile.lib
>> > -@@ -121,7 +121,8 @@ cpp_flags      = -Wp,-MD,$(depfile) $(NO
>> > - # yet ld_flags is fed to ld.
>> > - #ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
>> > - # Remove the -Wl, prefix from linker options normally passed through
>> gcc
>> > --ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS)
>> $(EXTRA_LDFLAGS))
>> > -+ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS)
>> $(EXTRA_LDFLAGS) $(CFLAGS) $(EXTRA_CFLAGS))
>> > -+ld_flags_partial = $($(filter-out -shared%, $(filter-out
>> -pie%,$(ld_flags))))
>> > -
>> > -
>> > - # Finds the multi-part object the current object will be linked into
>> > -@@ -151,10 +152,8 @@ $(obj)/%:: $(src)/%_shipped
>> > - # Linking
>> > - #
>> ---------------------------------------------------------------------------
>> > -
>> > --# TODO: LDFLAGS usually is supposed to contain gcc's flags, not ld's.
>> > --# but here we feed them to ld!
>> > --quiet_cmd_ld = LD      $@
>> > --cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
>> > -+quiet_cmd_ld = CC    $@
>> > -+cmd_ld = $(CC) $(ld_flags) $(LDFLAGS_$(@F)) \
>> > -              $(filter-out FORCE,$^) -o $@
>> > -
>> > - # Objcopy
>> > diff --git a/meta/recipes-core/busybox/busybox_1.34.1.bb
>> b/meta/recipes-core/busybox/busybox_1.34.1.bb
>> > index 6aed0f0476..3651c06126 100644
>> > --- a/meta/recipes-core/busybox/busybox_1.34.1.bb
>> > +++ b/meta/recipes-core/busybox/busybox_1.34.1.bb
>> > @@ -26,7 +26,6 @@ SRC_URI = "
>> https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
>> >             file://login-utilities.cfg \
>> >             file://recognize_connmand.patch \
>> >             file://busybox-cross-menuconfig.patch \
>> > -
>>  file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
>> >             file://mount-via-label.cfg \
>> >             file://sha1sum.cfg \
>> >             file://sha256sum.cfg \
>> > --
>> > 2.20.1
>> >
>> >
>> >
>> >
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#158461):
> https://lists.openembedded.org/g/openembedded-core/message/158461
> Mute This Topic: https://lists.openembedded.org/mt/87122011/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: 17219 bytes --]

Re: [OE-core] [PATCH 34/36] busybox: drop 0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch

[Andre McCurdy]

On Thu, Nov 18, 2021 at 2:32 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> I double checked, with strace (can't trust the logs as they don't show the actual linker invocation :)
>
> execve("/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc", ["x86_64-poky-linux-gcc", "-m64", "-march=core2", "-mtune=core2", "-msse3", "-mfpmath=sse", "-fstack-protector-strong", "-O2", "-D_FORTIFY_SOURCE=2", "--sysroot=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0/recipe-sysroot", "-malign-data=abi", "-Wall", "-Wshadow", "-Wwrite-strings", "-Wundef", "-Wstrict-prototypes", "-Wunused", "-Wunused-parameter", "-Wunused-function", "-Wunused-value", "-Wmissing-prototypes", "-Wmissing-declarations", "-Wno-format-security", "-Wdeclaration-after-statement", "-Wold-style-definition", "-finline-limit=0", "-fno-builtin-strlen", "-fomit-frame-pointer", "-ffunction-sections", "-fdata-sections", "-fno-guess-branch-probability", "-funsigned-char", "-static-libgcc", "-falign-functions=1", "-falign-jumps=1", "-falign-labels=1", "-falign-loops=1", "-fno-unwind-tables", "-fno-asynchronous-unwind-tables", "-fno-builtin-printf", "-Os", "-O2", "-pipe", "-g", "-feliminate-unused-debug-types", "-m64", "-march=core2", "-mtune=core2", "-msse3", "-mfpmath=sse", "-fstack-protector-strong", "-O2", "-D_FORTIFY_SOURCE=2", "-Wl,-O1", "-Wl,--hash-style=gnu", "-Wl,--as-needed", "-fmacro-prefix-map=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0=/usr/src/debug/busybox/1.34.1-r0", "-fdebug-prefix-map=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0=/usr/src/debug/busybox/1.34.1-r0", "-fdebug-prefix-map=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0/recipe-sysroot=", "-fdebug-prefix-map=/home/alex/development/poky/build-64-alt/tmp/work/core2-64-poky-linux/busybox/1.34.1-r0/recipe-sysroot-native=", "-Wl,-z,relro,-z,now", "-o", "busybox_unstripped", "-Wl,--sort-common", "-Wl,--sort-section,alignment", "-Wl,--gc-sections", "-Wl,--start-group", "applets/built-in.o", "archival/lib.a", "archival/libarchive/lib.a", "console-tools/lib.a", "coreutils/lib.a", "coreutils/libcoreutils/lib.a", "debianutils/lib.a", "klibc-utils/lib.a", "e2fsprogs/lib.a", "editors/lib.a", "findutils/lib.a", "init/lib.a", "libbb/lib.a", "libpwdgrp/lib.a", "loginutils/lib.a", "mailutils/lib.a", "miscutils/lib.a", "modutils/lib.a", "networking/lib.a", "networking/libiproute/lib.a", "networking/udhcp/lib.a", "printutils/lib.a", "procps/lib.a", "runit/lib.a", "selinux/lib.a", "shell/lib.a", "sysklogd/lib.a", "util-linux/lib.a", "util-linux/volume_id/lib.a", "archival/built-in.o", "archival/libarchive/built-in.o", "console-tools/built-in.o", "coreutils/built-in.o", "coreutils/libcoreutils/built-in.o", "debianutils/built-in.o", "klibc-utils/built-in.o", "e2fsprogs/built-in.o", "editors/built-in.o", "findutils/built-in.o", "init/built-in.o", "libbb/built-in.o", "libpwdgrp/built-in.o", "loginutils/built-in.o", "mailutils/built-in.o", "miscutils/built-in.o", "modutils/built-in.o", "networking/built-in.o", "networking/libiproute/built-in.o", "networking/udhcp/built-in.o", "printutils/built-in.o", "procps/built-in.o", "runit/built-in.o", "selinux/built-in.o", "shell/built-in.o", "sysklogd/built-in.o", "util-linux/built-in.o", "util-linux/volume_id/built-in.o", "-Wl,--end-group", "-Wl,--start-group", "-lcrypt", "-lm", "-lrt", "-Wl,--end-group"], 0x5654941e7a98 /* 138 vars */) = 0
>
> So everything that is supposed to be there is actually present, and the patch is indeed unneeded.

Looks good. If you have the full strace logs for both cases then it
might still be useful to check which (if any) command lines are
changed by removing the patch, but if not then removing the whole
patch does seem OK.

> Alex
>
> On Wed, 17 Nov 2021 at 23:05, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
>>
>> On Wed, 17 Nov 2021 at 21:43, Andre McCurdy <armccurdy@gmail.com> wrote:
>>>
>>> On Wed, Nov 17, 2021 at 7:36 AM Alexander Kanavin
>>> <alex.kanavin@gmail.com> wrote:
>>> >
>>> > This was added 10 years ago, is almost certainly non-upstreamable
>>> > and it isn't clear what the issues it aims to fix are:
>>> > the AB revealed no problems when the patch is removed.
>>>
>>> The comment in the patch was: This fixes the issue where LDFLAGS
>>> escaped with -Wl are ignored during compilation. Seems fairly clear!
>>>
>>> Checking that the AB run didn't fail is probably not enough to justify
>>> removing this patch. You should also confirm that LDFLAGS escaped with
>>> -Wl (e.g. -Wl,-z,relro,-z,now when security flags are enabled, etc)
>>> are still passed to the linker.
>>
>>
>> Thanks, I will double check.
>>
>> Alex
>>
>>>
>>>
>>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>>> > ---
>>> >  ...ing-instead-of-LD-and-use-CFLAGS-and.patch | 114 ------------------
>>> >  meta/recipes-core/busybox/busybox_1.34.1.bb   |   1 -
>>> >  2 files changed, 115 deletions(-)
>>> >  delete mode 100644 meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
>>> >
>>> > diff --git a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch b/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
>>> > deleted file mode 100644
>>> > index 2bf2b91c7e..0000000000
>>> > --- a/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
>>> > +++ /dev/null
>>> > @@ -1,114 +0,0 @@
>>> > -From a9333eb6a7b8dbda735947cd5bc981ff9352a2c9 Mon Sep 17 00:00:00 2001
>>> > -From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
>>> > -Date: Thu, 10 Mar 2011 00:27:08 -0500
>>> > -Subject: [PATCH 1/2] Use $(CC) when linking instead of $(LD) and use $(CFLAGS)
>>> > - and $(EXTRA_CFLAGS) when linking.
>>> > -
>>> > -This fixes the issue where LDFLAGS escaped with -Wl are ignored during
>>> > -compilation. It also simplifies using CFLAGS or EXTRA_CFLAGS (such as
>>> > --m32 on x86_64 or -flto) which apply to both compilation and linking
>>> > -situations.
>>> > -
>>> > -Signed-off-by: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
>>> > ----
>>> > -Upstream-Status: Pending
>>> > -
>>> > - Makefile               |  7 ++++---
>>> > - scripts/Makefile.build |  8 ++++----
>>> > - scripts/Makefile.lib   | 13 +++----------
>>> > - 3 files changed, 11 insertions(+), 17 deletions(-)
>>> > -
>>> > -Index: busybox-1.23.2/Makefile
>>> > -===================================================================
>>> > ---- busybox-1.23.2.orig/Makefile
>>> > -+++ busybox-1.23.2/Makefile
>>> > -@@ -309,7 +309,8 @@ CHECKFLAGS     := -D__linux__ -Dlinux -D
>>> > - MODFLAGS      = -DMODULE
>>> > - CFLAGS_MODULE   = $(MODFLAGS)
>>> > - AFLAGS_MODULE   = $(MODFLAGS)
>>> > --LDFLAGS_MODULE  = -r
>>> > -+LDFLAGS_RELOCATABLE = -r -nostdlib
>>> > -+LDFLAGS_MODULE  = $(LDFLAGS_RELOCATABLE)
>>> > - CFLAGS_KERNEL =
>>> > - AFLAGS_KERNEL =
>>> > -
>>> > -@@ -331,7 +332,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL)
>>> > - export        VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
>>> > -       ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
>>> > -       CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \
>>> > --      HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
>>> > -+      HOSTCXX HOSTCXXFLAGS LDFLAGS_RELOCATABLE LDFLAGS_MODULE CHECK CHECKFLAGS
>>> > -
>>> > - export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
>>> > - export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
>>> > -@@ -610,7 +611,7 @@ quiet_cmd_busybox__ ?= LINK    $@
>>> > -       cmd_busybox__ ?= $(srctree)/scripts/trylink \
>>> > -       "$@" \
>>> > -       "$(CC)" \
>>> > --      "$(CFLAGS) $(CFLAGS_busybox)" \
>>> > -+      "$(CFLAGS) $(CFLAGS_busybox) $(EXTRA_CFLAGS)" \
>>> > -       "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
>>> > -       "$(core-y)" \
>>> > -       "$(libs-y)" \
>>> > -Index: busybox-1.23.2/scripts/Makefile.build
>>> > -===================================================================
>>> > ---- busybox-1.23.2.orig/scripts/Makefile.build
>>> > -+++ busybox-1.23.2/scripts/Makefile.build
>>> > -@@ -174,7 +174,7 @@ cmd_modversions =                                                  \
>>> > -               | $(GENKSYMS) -a $(ARCH)                                \
>>> > -               > $(@D)/.tmp_$(@F:.o=.ver);                             \
>>> > -                                                                       \
>>> > --              $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)              \
>>> > -+               $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@ $(@D)/.tmp_$(@F)        \
>>> > -                       -T $(@D)/.tmp_$(@F:.o=.ver);                    \
>>> > -               rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);        \
>>> > -       else                                                            \
>>> > -@@ -257,7 +257,7 @@ quiet_cmd_link_o_target = LD      $@
>>> > - # If the list of objects to link is empty, just create an empty built-in.o
>>> > - # -nostdlib is added to make "make LD=gcc ..." work (some people use that)
>>> > - cmd_link_o_target = $(if $(strip $(obj-y)),\
>>> > --              $(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
>>> > -+              $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@ $(filter $(obj-y), $^),\
>>> > -               rm -f $@; $(AR) rcs $@)
>>> > -
>>> > - $(builtin-target): $(obj-y) FORCE
>>> > -@@ -292,10 +292,10 @@ $($(subst $(obj)/,,$(@:.o=-objs)))    \
>>> > - $($(subst $(obj)/,,$(@:.o=-y)))), $^)
>>> > -
>>> > - quiet_cmd_link_multi-y = LD      $@
>>> > --cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
>>> > -+cmd_link_multi-y = $(CC) $(ld_flags_partial) $(LDFLAGS_RELOCATABLE) -o $@ $(link_multi_deps)
>>> > -
>>> > - quiet_cmd_link_multi-m = LD [M]  $@
>>> > --cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
>>> > -+cmd_link_multi-m = $(CC) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
>>> > -
>>> > - # We would rather have a list of rules like
>>> > - #     foo.o: $(foo-objs)
>>> > -Index: busybox-1.23.2/scripts/Makefile.lib
>>> > -===================================================================
>>> > ---- busybox-1.23.2.orig/scripts/Makefile.lib
>>> > -+++ busybox-1.23.2/scripts/Makefile.lib
>>> > -@@ -121,7 +121,8 @@ cpp_flags      = -Wp,-MD,$(depfile) $(NO
>>> > - # yet ld_flags is fed to ld.
>>> > - #ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
>>> > - # Remove the -Wl, prefix from linker options normally passed through gcc
>>> > --ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS))
>>> > -+ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS) $(CFLAGS) $(EXTRA_CFLAGS))
>>> > -+ld_flags_partial = $($(filter-out -shared%, $(filter-out -pie%,$(ld_flags))))
>>> > -
>>> > -
>>> > - # Finds the multi-part object the current object will be linked into
>>> > -@@ -151,10 +152,8 @@ $(obj)/%:: $(src)/%_shipped
>>> > - # Linking
>>> > - # ---------------------------------------------------------------------------
>>> > -
>>> > --# TODO: LDFLAGS usually is supposed to contain gcc's flags, not ld's.
>>> > --# but here we feed them to ld!
>>> > --quiet_cmd_ld = LD      $@
>>> > --cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
>>> > -+quiet_cmd_ld = CC    $@
>>> > -+cmd_ld = $(CC) $(ld_flags) $(LDFLAGS_$(@F)) \
>>> > -              $(filter-out FORCE,$^) -o $@
>>> > -
>>> > - # Objcopy
>>> > diff --git a/meta/recipes-core/busybox/busybox_1.34.1.bb b/meta/recipes-core/busybox/busybox_1.34.1.bb
>>> > index 6aed0f0476..3651c06126 100644
>>> > --- a/meta/recipes-core/busybox/busybox_1.34.1.bb
>>> > +++ b/meta/recipes-core/busybox/busybox_1.34.1.bb
>>> > @@ -26,7 +26,6 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
>>> >             file://login-utilities.cfg \
>>> >             file://recognize_connmand.patch \
>>> >             file://busybox-cross-menuconfig.patch \
>>> > -           file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
>>> >             file://mount-via-label.cfg \
>>> >             file://sha1sum.cfg \
>>> >             file://sha256sum.cfg \
>>> > --
>>> > 2.20.1
>>> >
>>> >
>>> >
>>> >
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#158461): https://lists.openembedded.org/g/openembedded-core/message/158461
>> Mute This Topic: https://lists.openembedded.org/mt/87122011/1686489
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>

Re: [OE-core] [PATCH 34/36] busybox: drop 0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch

[Alexander Kanavin]

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

On Fri, 19 Nov 2021 at 00:14, Andre McCurdy <armccurdy@gmail.com> wrote:

> > So everything that is supposed to be there is actually present, and the
> patch is indeed unneeded.
>
> Looks good. If you have the full strace logs for both cases then it
> might still be useful to check which (if any) command lines are
> changed by removing the patch, but if not then removing the whole
> patch does seem OK.
>

There is no tooling to compare strace files, they have process ids, and
probably other unrelated files that needs to be stripped out or matched.

Just to reiterate: this is for the master branch, and I do insist on "if AB
is green then it works as intended" - if issues are found later, then the
right way to deal with them is to improve the AB tests, not ask maintainers
do even more manual work. Can you help me review the remaining 400
"upstream-status: pending" patches?

Alex

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

Re: [OE-core] [PATCH 34/36] busybox: drop 0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch

[Andre McCurdy]

On Fri, Nov 19, 2021 at 12:17 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> On Fri, 19 Nov 2021 at 00:14, Andre McCurdy <armccurdy@gmail.com> wrote:
>>
>> > So everything that is supposed to be there is actually present, and the patch is indeed unneeded.
>>
>> Looks good. If you have the full strace logs for both cases then it
>> might still be useful to check which (if any) command lines are
>> changed by removing the patch, but if not then removing the whole
>> patch does seem OK.
>
> There is no tooling to compare strace files, they have process ids, and probably other unrelated files that needs to be stripped out or matched.

I guess looking at the two logs in a graphical tool such as meld would
highlight if command line options completely disappear, even with the
noise of differences in process IDs etc.

> Just to reiterate: this is for the master branch, and I do insist on "if AB is green then it works as intended" - if issues are found later, then the right way to deal with them is to improve the AB tests, not ask maintainers do even more manual work.

Yes, and I'm agreeing with you!

> Can you help me review the remaining 400 "upstream-status: pending" patches?

No. I made the decision some time ago to stop contributing to OE. Not
planning on restarting now.

[PATCH 35/36] slang: mark patch as inappropriate for upstream submission

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/slang/slang/terminfo_fixes.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/slang/slang/terminfo_fixes.patch b/meta/recipes-extended/slang/slang/terminfo_fixes.patch
index 3e6d15aa79..3ca20a8cab 100644
--- a/meta/recipes-extended/slang/slang/terminfo_fixes.patch
+++ b/meta/recipes-extended/slang/slang/terminfo_fixes.patch
@@ -2,7 +2,9 @@ Do not use the JD_TERMCAP macro since we cannot get the terminfo from
 ncurses pkg-config, but fix the macro to not reference host directories.
 Also add src/test/Makefile.in so that we can use -ltermcap if we want to.
 
-Upstream-Status: Pending
+Upstream isn't going to take this, as it forces blank values and
+removes functionality without replacing it.
+Upstream-Status: Inappropriate [see above]
 
 Signed-off-by: Joe Slater <joe.slater@windriver.com>
 
-- 
2.20.1

[PATCH 36/36] librsvg: submit system-deps patch upstream

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...endor-system-deps-sort-dependencies-before-using-th.patch | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-vendor-system-deps-sort-dependencies-before-using-th.patch b/meta/recipes-gnome/librsvg/librsvg/0001-vendor-system-deps-sort-dependencies-before-using-th.patch
index 9fe11930d3..21565c8faa 100644
--- a/meta/recipes-gnome/librsvg/librsvg/0001-vendor-system-deps-sort-dependencies-before-using-th.patch
+++ b/meta/recipes-gnome/librsvg/librsvg/0001-vendor-system-deps-sort-dependencies-before-using-th.patch
@@ -6,10 +6,7 @@ Subject: [PATCH] vendor/system-deps: sort dependencies before using them
 Otherwise they come out in non-reproducible order, leaking into
 target binaries.
 
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
-
+Upstream-Status: Submitted [https://github.com/gdesmott/system-deps/pull/56]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 ---
  vendor/system-deps/.cargo-checksum.json | 3 ++-
-- 
2.20.1