diff mbox series

[meta-oe] meta-oe: fix Upstream-Status format

Message ID 20230223124050.2282580-1-yi.zhao@windriver.com
State Under Review
Headers show
Series [meta-oe] meta-oe: fix Upstream-Status format | expand

Commit Message

Yi Zhao Feb. 23, 2023, 12:40 p.m. UTC
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../0001-server-Adjust-the-cache-alignment-assumptions.patch  | 2 +-
 .../obexftp/obexftp/Remove_some_printf_in_obexftpd.patch      | 2 +-
 .../lshw/files/0001-disable-docbook2man.patch                 | 2 +-
 .../fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch      | 2 +-
 ...rust.configure-do-not-try-to-find-a-suitable-upstrea.patch | 2 +-
 .../lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch               | 4 +---
 .../hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff                | 2 +-
 .../libb64/libb64/0001-example-Do-not-run-the-tests.patch     | 2 +-
 ...configure.ac-do-additional-checks-on-libxml2-also-wh.patch | 4 +---
 .../sharutils/sharutils/CVE-2018-1000097.patch                | 2 +-
 10 files changed, 10 insertions(+), 14 deletions(-)

Comments

Martin Jansa Feb. 23, 2023, 1:12 p.m. UTC | #1
Be aware that with:
https://patchwork.yoctoproject.org/project/oe-core/patch/20230215172041.636292-3-Martin.Jansa@gmail.com/

meta-oe layers have 81 malformed Upstream-Status entries (before your
patches are applied), so there are many more cases.

But I agree that if it's included, it should be in the right format,
because other people might copy&paste it to other new .patch files as well.

I can send fixes for the rest.

On Thu, Feb 23, 2023 at 1:41 PM Yi Zhao <yi.zhao@eng.windriver.com> wrote:

> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
>  .../0001-server-Adjust-the-cache-alignment-assumptions.patch  | 2 +-
>  .../obexftp/obexftp/Remove_some_printf_in_obexftpd.patch      | 2 +-
>  .../lshw/files/0001-disable-docbook2man.patch                 | 2 +-
>  .../fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch      | 2 +-
>  ...rust.configure-do-not-try-to-find-a-suitable-upstrea.patch | 2 +-
>  .../lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch               | 4 +---
>  .../hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff                | 2 +-
>  .../libb64/libb64/0001-example-Do-not-run-the-tests.patch     | 2 +-
>  ...configure.ac-do-additional-checks-on-libxml2-also-wh.patch | 4 +---
>  .../sharutils/sharutils/CVE-2018-1000097.patch                | 2 +-
>  10 files changed, 10 insertions(+), 14 deletions(-)
>
> diff --git
> a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
> b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
> index bf083c85f..52c9df9b1 100644
> ---
> a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
> +++
> b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
> @@ -15,7 +15,7 @@ src/mongo/db/stats/counters.h:185:47: error: static
> assertion failed: cache line
>  The structure need to ensure true sharing for both the elements
>  so align it to hardware_constructive_interference_size instead
>
> -Upstream-Status: Reported [https://jira.mongodb.org/browse/SERVER-65664]
> +Upstream-Status: Inappropriate [
> https://jira.mongodb.org/browse/SERVER-65664]
>
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>  ---
> diff --git
> a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
> b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
> index 8b73af32e..23e92885e 100644
> ---
> a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
> +++
> b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
> @@ -1,6 +1,6 @@
>  Signed-off-by: Jun Zhu <R01007@freescale.com>
>
> -Upstream-Status:  Not applicable
> +Upstream-Status: Inappropriate [embedded specific]
>
>  diff -Nru obexftp-0.23/apps.orig/obexftpd.c obexftp-0.23/apps/obexftpd.c
>  --- obexftp-0.23/apps.orig/obexftpd.c  2013-11-08 10:42:20.816631583 +0800
> diff --git
> a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
> b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
> index 00f7b8674..706f2d524 100644
> --- a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
> +++ b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
> @@ -5,7 +5,7 @@ Subject: [PATCH] build: Do not build .sgml file
>
>  It needs docbook2man tool which we do not have recipe for
>
> -Upstream-Status: OE-Specific [needs native docbook2man tool]
> +Upstream-Status: Inappropriate [needs native docbook2man tool]
>
>  Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
>  ---
> diff --git
> a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
> b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
> index 6c585c2f5..158857ae2 100644
> ---
> a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
> +++
> b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
> @@ -7,7 +7,7 @@ bitbake passes CFLAGS that are often in conflict with the
> ones set
>  in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
>  FORTIFY_SOURCE=2 except in release mode
>
> -Upstream-Status: Innapropriate [due to fluent-bit having it's own Release
> flags that also overwrite bitbake ones.]
> +Upstream-Status: Inappropriate [due to fluent-bit having it's own Release
> flags that also overwrite bitbake ones.]
>  ---
>   lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
>   1 file changed, 2 deletions(-)
> diff --git
> a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
> b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
> index e63b05356..202f12612 100644
> ---
> a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
> +++
> b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
> @@ -5,7 +5,7 @@ Subject: [PATCH] rust.configure: do not try to find a
> suitable upstream target
>
>  OE is using custom targets and so this is bound to fail.
>
> -Upstream-Status: Inapppropriate [oe-core specific]
> +Upstream-Status: Inappropriate [oe-core specific]
>  Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>
>  ---
> diff --git
> a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
> b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
> index afe11f353..d232f6913 100644
> --- a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
> +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
> @@ -3,9 +3,7 @@ From: dgod <dgod.osa@gmail.com>
>  Date: Mon, 21 Mar 2016 19:25:25 +0800
>  Subject: [PATCH] fix css under gtk 3.20
>
> -Upstream-Status: Applied [1]
> -
> -[1]
> https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771
> +Upstream-Status
> <https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771+Upstream-Status>:
> Backport [
> https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771
> ]
>  ---
>   data/themes/Industrial/gtk.css | 1 +
>   1 file changed, 1 insertion(+)
> diff --git
> a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
> b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
> index 057b1fd1d..60953381a 100644
> --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
> +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
> @@ -6,7 +6,7 @@ Filtered with:
>    filterdiff -p1 -x README -x 'debian/*'
>
>
> -Upstream-Status: unmaintained
> +Upstream-Status: Inappropriate [unmaintained]
>
>  Index: hddtemp-0.3-beta15/doc/hddtemp.8
>  ===================================================================
> diff --git
> a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
> b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
> index ea3ddfb64..b3ee24d9d 100644
> ---
> a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
> +++
> b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
> @@ -3,7 +3,7 @@ From: Khem Raj <raj.khem@gmail.com>
>  Date: Sat, 27 Mar 2021 21:41:04 -0700
>  Subject: [PATCH] example: Do not run the tests
>
> -Upstream-Status: Inappropritate [Cross-compile specific]
> +Upstream-Status: Inappropriate [Cross-compile specific]
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>  ---
>   examples/Makefile | 3 ---
> diff --git
> a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
> b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
> index 7faeb130a..490b61f1f 100644
> ---
> a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
> +++
> b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
> @@ -7,9 +7,7 @@ MIME-Version: 1.0
>  Content-Type: text/plain; charset=UTF-8
>  Content-Transfer-Encoding: 8bit
>
> -Upstream-Status: Applied [1]
> -
> -[1] https://github.com/dajobe/raptor/pull/33
> +Upstream-Status: Backport [
> https://github.com/dajobe/raptor/commit/e75b1dbb7f2a6514b8d391b200c45a2bec6268bf
> ]
>
>  Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>  ---
> diff --git
> a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
> b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
> index 99dc4e304..47eb9cfd6 100644
> --- a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
> +++ b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
> @@ -36,7 +36,7 @@ This was reported in
>  <http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html>.
>
>  CVE: CVE-2018-1000097
> -Upstream-Status: no upstream [
> http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html]
> +Upstream-Status: Inappropriate [no upstream]
>  Signed-off-by: Petr Písař <ppisar@redhat.com>
>  Signed-off-by: Sinan Kaya <okaya@kernel.org>
>  ---
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#101224):
> https://lists.openembedded.org/g/openembedded-devel/message/101224
> Mute This Topic: https://lists.openembedded.org/mt/97181611/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Martin Jansa Feb. 23, 2023, 1:54 p.m. UTC | #2
I've sent them now (on top of your 4 patches).

Some stats from meta-oe layers:

meta-oe Total patches found: 1230
meta-networking Total patches found: 496
meta-python     Total patches found: 106
meta-multimedia Total patches found: 82
meta-initramfs  Total patches found: 60
meta-gnome      Total patches found: 55
meta-filesystems        Total patches found: 43
meta-webserver  Total patches found: 40
meta-xfce       Total patches found: 18
meta-perl       Total patches found: 12

meta-filesystems        Patches missing Signed-off-by: 4 (9%)
meta-filesystems        Patches missing Upstream-Status: 13 (30%)
meta-filesystems        Patches in Pending state: 10 (23%)
meta-gnome      Patches missing Signed-off-by: 4 (7%)
meta-gnome      Patches missing Upstream-Status: 6 (11%)
meta-gnome      Patches in Pending state: 15 (27%)
meta-initramfs  Patches missing Signed-off-by: 4 (7%)
meta-initramfs  Patches missing Upstream-Status: 20 (33%)
meta-initramfs  Patches in Pending state: 6 (10%)
meta-multimedia Patches missing Signed-off-by: 11 (13%)
meta-multimedia Patches missing Upstream-Status: 19 (23%)
meta-multimedia Patches in Pending state: 27 (33%)
meta-networking Patches missing Signed-off-by: 66 (13%)
meta-networking Patches missing CVE: 2 (0%)
meta-networking Patches missing Upstream-Status: 130 (26%)
meta-networking Patches in Pending state: 188 (38%)
meta-oe Patches missing Signed-off-by: 226 (18%)
meta-oe Patches missing CVE: 5 (0%)
meta-oe Patches missing Upstream-Status: 381 (31%)
meta-oe Patches in Pending state: 370 (30%)
meta-perl       Patches missing Signed-off-by: 1 (8%)
meta-perl       Patches missing Upstream-Status: 1 (8%)
meta-perl       Patches in Pending state: 6 (50%)
meta-python     Patches missing Signed-off-by: 9 (8%)
meta-python     Patches missing CVE: 2 (2%)
meta-python     Patches missing Upstream-Status: 20 (19%)
meta-python     Patches in Pending state: 30 (28%)
meta-webserver  Patches missing Signed-off-by: 12 (30%)
meta-webserver  Patches missing Upstream-Status: 9 (22%)
meta-webserver  Patches in Pending state: 13 (32%)
meta-xfce       Patches missing Upstream-Status: 2 (11%)
meta-xfce       Patches in Pending state: 4 (22%)

If someone really wants I can add Upstream-Status: Pending to .patches
without any Upstream-Status (I already have oneliner to do that), but that
just replaces missing with Pending without adding any other value (other
than avoiding warnings from the QA check). But I also don't expect the
regular contributors to be able to add missing Upstream-Status in remaining
30% patches anytime soon.

Cheers,

On Thu, Feb 23, 2023 at 2:12 PM Martin Jansa via lists.openembedded.org
<Martin.Jansa=gmail.com@lists.openembedded.org> wrote:

> Be aware that with:
>
> https://patchwork.yoctoproject.org/project/oe-core/patch/20230215172041.636292-3-Martin.Jansa@gmail.com/
>
> meta-oe layers have 81 malformed Upstream-Status entries (before your
> patches are applied), so there are many more cases.
>
> But I agree that if it's included, it should be in the right format,
> because other people might copy&paste it to other new .patch files as well.
>
> I can send fixes for the rest.
>
> On Thu, Feb 23, 2023 at 1:41 PM Yi Zhao <yi.zhao@eng.windriver.com> wrote:
>
>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>> ---
>>  .../0001-server-Adjust-the-cache-alignment-assumptions.patch  | 2 +-
>>  .../obexftp/obexftp/Remove_some_printf_in_obexftpd.patch      | 2 +-
>>  .../lshw/files/0001-disable-docbook2man.patch                 | 2 +-
>>  .../fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch      | 2 +-
>>  ...rust.configure-do-not-try-to-find-a-suitable-upstrea.patch | 2 +-
>>  .../lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch               | 4 +---
>>  .../hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff                | 2 +-
>>  .../libb64/libb64/0001-example-Do-not-run-the-tests.patch     | 2 +-
>>  ...configure.ac-do-additional-checks-on-libxml2-also-wh.patch | 4 +---
>>  .../sharutils/sharutils/CVE-2018-1000097.patch                | 2 +-
>>  10 files changed, 10 insertions(+), 14 deletions(-)
>>
>> diff --git
>> a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
>> b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
>> index bf083c85f..52c9df9b1 100644
>> ---
>> a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
>> +++
>> b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
>> @@ -15,7 +15,7 @@ src/mongo/db/stats/counters.h:185:47: error: static
>> assertion failed: cache line
>>  The structure need to ensure true sharing for both the elements
>>  so align it to hardware_constructive_interference_size instead
>>
>> -Upstream-Status: Reported [https://jira.mongodb.org/browse/SERVER-65664]
>> +Upstream-Status: Inappropriate [
>> https://jira.mongodb.org/browse/SERVER-65664]
>>
>>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>  ---
>> diff --git
>> a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
>> b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
>> index 8b73af32e..23e92885e 100644
>> ---
>> a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
>> +++
>> b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
>> @@ -1,6 +1,6 @@
>>  Signed-off-by: Jun Zhu <R01007@freescale.com>
>>
>> -Upstream-Status:  Not applicable
>> +Upstream-Status: Inappropriate [embedded specific]
>>
>>  diff -Nru obexftp-0.23/apps.orig/obexftpd.c obexftp-0.23/apps/obexftpd.c
>>  --- obexftp-0.23/apps.orig/obexftpd.c  2013-11-08 10:42:20.816631583
>> +0800
>> diff --git
>> a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
>> b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
>> index 00f7b8674..706f2d524 100644
>> --- a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
>> +++ b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
>> @@ -5,7 +5,7 @@ Subject: [PATCH] build: Do not build .sgml file
>>
>>  It needs docbook2man tool which we do not have recipe for
>>
>> -Upstream-Status: OE-Specific [needs native docbook2man tool]
>> +Upstream-Status: Inappropriate [needs native docbook2man tool]
>>
>>  Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
>>  ---
>> diff --git
>> a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
>> b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
>> index 6c585c2f5..158857ae2 100644
>> ---
>> a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
>> +++
>> b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
>> @@ -7,7 +7,7 @@ bitbake passes CFLAGS that are often in conflict with the
>> ones set
>>  in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
>>  FORTIFY_SOURCE=2 except in release mode
>>
>> -Upstream-Status: Innapropriate [due to fluent-bit having it's own
>> Release flags that also overwrite bitbake ones.]
>> +Upstream-Status: Inappropriate [due to fluent-bit having it's own
>> Release flags that also overwrite bitbake ones.]
>>  ---
>>   lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
>>   1 file changed, 2 deletions(-)
>> diff --git
>> a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
>> b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
>> index e63b05356..202f12612 100644
>> ---
>> a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
>> +++
>> b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
>> @@ -5,7 +5,7 @@ Subject: [PATCH] rust.configure: do not try to find a
>> suitable upstream target
>>
>>  OE is using custom targets and so this is bound to fail.
>>
>> -Upstream-Status: Inapppropriate [oe-core specific]
>> +Upstream-Status: Inappropriate [oe-core specific]
>>  Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>>
>>  ---
>> diff --git
>> a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
>> b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
>> index afe11f353..d232f6913 100644
>> --- a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
>> +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
>> @@ -3,9 +3,7 @@ From: dgod <dgod.osa@gmail.com>
>>  Date: Mon, 21 Mar 2016 19:25:25 +0800
>>  Subject: [PATCH] fix css under gtk 3.20
>>
>> -Upstream-Status: Applied [1]
>> -
>> -[1]
>> https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771
>> +Upstream-Status
>> <https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771+Upstream-Status>:
>> Backport [
>> https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771
>> ]
>>  ---
>>   data/themes/Industrial/gtk.css | 1 +
>>   1 file changed, 1 insertion(+)
>> diff --git
>> a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
>> b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
>> index 057b1fd1d..60953381a 100644
>> --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
>> +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
>> @@ -6,7 +6,7 @@ Filtered with:
>>    filterdiff -p1 -x README -x 'debian/*'
>>
>>
>> -Upstream-Status: unmaintained
>> +Upstream-Status: Inappropriate [unmaintained]
>>
>>  Index: hddtemp-0.3-beta15/doc/hddtemp.8
>>  ===================================================================
>> diff --git
>> a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
>> b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
>> index ea3ddfb64..b3ee24d9d 100644
>> ---
>> a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
>> +++
>> b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
>> @@ -3,7 +3,7 @@ From: Khem Raj <raj.khem@gmail.com>
>>  Date: Sat, 27 Mar 2021 21:41:04 -0700
>>  Subject: [PATCH] example: Do not run the tests
>>
>> -Upstream-Status: Inappropritate [Cross-compile specific]
>> +Upstream-Status: Inappropriate [Cross-compile specific]
>>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>  ---
>>   examples/Makefile | 3 ---
>> diff --git
>> a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>> b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>> index 7faeb130a..490b61f1f 100644
>> ---
>> a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>> +++
>> b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>> @@ -7,9 +7,7 @@ MIME-Version: 1.0
>>  Content-Type: text/plain; charset=UTF-8
>>  Content-Transfer-Encoding: 8bit
>>
>> -Upstream-Status: Applied [1]
>> -
>> -[1] https://github.com/dajobe/raptor/pull/33
>> +Upstream-Status: Backport [
>> https://github.com/dajobe/raptor/commit/e75b1dbb7f2a6514b8d391b200c45a2bec6268bf
>> ]
>>
>>  Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>>  ---
>> diff --git
>> a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
>> b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
>> index 99dc4e304..47eb9cfd6 100644
>> --- a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
>> +++ b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
>> @@ -36,7 +36,7 @@ This was reported in
>>  <http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html>.
>>
>>  CVE: CVE-2018-1000097
>> -Upstream-Status: no upstream [
>> http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html]
>> +Upstream-Status: Inappropriate [no upstream]
>>  Signed-off-by: Petr Písař <ppisar@redhat.com>
>>  Signed-off-by: Sinan Kaya <okaya@kernel.org>
>>  ---
>> --
>> 2.25.1
>>
>>
>>
>>
>>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#101228):
> https://lists.openembedded.org/g/openembedded-devel/message/101228
> Mute This Topic: https://lists.openembedded.org/mt/97181611/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Yi Zhao Feb. 23, 2023, 2:18 p.m. UTC | #3
On 2/23/23 21:12, Martin Jansa wrote:
> Be aware that with:
> https://patchwork.yoctoproject.org/project/oe-core/patch/20230215172041.636292-3-Martin.Jansa@gmail.com/ 
> <https://urldefense.com/v3/__https://patchwork.yoctoproject.org/project/oe-core/patch/20230215172041.636292-3-Martin.Jansa@gmail.com/__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53LpUrgdK0$>
>
> meta-oe layers have 81 malformed Upstream-Status entries (before your 
> patches are applied), so there are many more cases.
>
> But I agree that if it's included, it should be in the right format, 
> because other people might copy&paste it to other new .patch files as 
> well.
>
> I can send fixes for the rest.


Thanks Martin. The ones I fixed were checked out by layerindex.


//Yi

>
> On Thu, Feb 23, 2023 at 1:41 PM Yi Zhao <yi.zhao@eng.windriver.com> wrote:
>
>     Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>     ---
>      .../0001-server-Adjust-the-cache-alignment-assumptions.patch | 2 +-
>      .../obexftp/obexftp/Remove_some_printf_in_obexftpd.patch | 2 +-
>      .../lshw/files/0001-disable-docbook2man.patch  | 2 +-
>      .../fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch | 2 +-
>      ...rust.configure-do-not-try-to-find-a-suitable-upstrea.patch | 2 +-
>      .../lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch  | 4 +---
>      .../hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff | 2 +-
>      .../libb64/libb64/0001-example-Do-not-run-the-tests.patch  | 2 +-
>      ...configure.ac-do-additional-checks-on-libxml2-also-wh.patch | 4
>     +---
>      .../sharutils/sharutils/CVE-2018-1000097.patch | 2 +-
>      10 files changed, 10 insertions(+), 14 deletions(-)
>
>     diff --git
>     a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
>     b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
>     index bf083c85f..52c9df9b1 100644
>     ---
>     a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
>     +++
>     b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
>     @@ -15,7 +15,7 @@ src/mongo/db/stats/counters.h:185:47: error:
>     static assertion failed: cache line
>      The structure need to ensure true sharing for both the elements
>      so align it to hardware_constructive_interference_size instead
>
>     -Upstream-Status: Reported
>     [https://jira.mongodb.org/browse/SERVER-65664
>     <https://urldefense.com/v3/__https://jira.mongodb.org/browse/SERVER-65664__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53LgylQYHY$>]
>     +Upstream-Status: Inappropriate
>     [https://jira.mongodb.org/browse/SERVER-65664
>     <https://urldefense.com/v3/__https://jira.mongodb.org/browse/SERVER-65664__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53LgylQYHY$>]
>
>      Signed-off-by: Khem Raj <raj.khem@gmail.com>
>      ---
>     diff --git
>     a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
>     b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
>     index 8b73af32e..23e92885e 100644
>     ---
>     a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
>     +++
>     b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
>     @@ -1,6 +1,6 @@
>      Signed-off-by: Jun Zhu <R01007@freescale.com>
>
>     -Upstream-Status:  Not applicable
>     +Upstream-Status: Inappropriate [embedded specific]
>
>      diff -Nru obexftp-0.23/apps.orig/obexftpd.c
>     obexftp-0.23/apps/obexftpd.c
>      --- obexftp-0.23/apps.orig/obexftpd.c  2013-11-08
>     10:42:20.816631583 +0800
>     diff --git
>     a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
>     b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
>     index 00f7b8674..706f2d524 100644
>     ---
>     a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
>     +++
>     b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
>     @@ -5,7 +5,7 @@ Subject: [PATCH] build: Do not build .sgml file
>
>      It needs docbook2man tool which we do not have recipe for
>
>     -Upstream-Status: OE-Specific [needs native docbook2man tool]
>     +Upstream-Status: Inappropriate [needs native docbook2man tool]
>
>      Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
>      ---
>     diff --git
>     a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
>     b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
>     index 6c585c2f5..158857ae2 100644
>     ---
>     a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
>     +++
>     b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
>     @@ -7,7 +7,7 @@ bitbake passes CFLAGS that are often in conflict
>     with the ones set
>      in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
>      FORTIFY_SOURCE=2 except in release mode
>
>     -Upstream-Status: Innapropriate [due to fluent-bit having it's own
>     Release flags that also overwrite bitbake ones.]
>     +Upstream-Status: Inappropriate [due to fluent-bit having it's own
>     Release flags that also overwrite bitbake ones.]
>      ---
>       lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
>       1 file changed, 2 deletions(-)
>     diff --git
>     a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
>     b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
>     index e63b05356..202f12612 100644
>     ---
>     a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
>     +++
>     b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
>     @@ -5,7 +5,7 @@ Subject: [PATCH] rust.configure: do not try to
>     find a suitable upstream target
>
>      OE is using custom targets and so this is bound to fail.
>
>     -Upstream-Status: Inapppropriate [oe-core specific]
>     +Upstream-Status: Inappropriate [oe-core specific]
>      Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>
>      ---
>     diff --git
>     a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
>     b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
>     index afe11f353..d232f6913 100644
>     ---
>     a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
>     +++
>     b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
>     @@ -3,9 +3,7 @@ From: dgod <dgod.osa@gmail.com>
>      Date: Mon, 21 Mar 2016 19:25:25 +0800
>      Subject: [PATCH] fix css under gtk 3.20
>
>     -Upstream-Status: Applied [1]
>     -
>     -[1]
>     https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771
>     +Upstream-Status
>     <https://urldefense.com/v3/__https://git.lxde.org/gitweb/?p=lxde*lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771*Upstream-Status__;Lys!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53L-bK1X_s$>:
>     Backport
>     [https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771
>     <https://urldefense.com/v3/__https://git.lxde.org/gitweb/?p=lxde*lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771__;Lw!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53LobvSxMI$>]
>      ---
>       data/themes/Industrial/gtk.css | 1 +
>       1 file changed, 1 insertion(+)
>     diff --git
>     a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
>     b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
>     index 057b1fd1d..60953381a 100644
>     ---
>     a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
>     +++
>     b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
>     @@ -6,7 +6,7 @@ Filtered with:
>        filterdiff -p1 -x README -x 'debian/*'
>
>
>     -Upstream-Status: unmaintained
>     +Upstream-Status: Inappropriate [unmaintained]
>
>      Index: hddtemp-0.3-beta15/doc/hddtemp.8
>      ===================================================================
>     diff --git
>     a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
>     b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
>     index ea3ddfb64..b3ee24d9d 100644
>     ---
>     a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
>     +++
>     b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
>     @@ -3,7 +3,7 @@ From: Khem Raj <raj.khem@gmail.com>
>      Date: Sat, 27 Mar 2021 21:41:04 -0700
>      Subject: [PATCH] example: Do not run the tests
>
>     -Upstream-Status: Inappropritate [Cross-compile specific]
>     +Upstream-Status: Inappropriate [Cross-compile specific]
>      Signed-off-by: Khem Raj <raj.khem@gmail.com>
>      ---
>       examples/Makefile | 3 ---
>     diff --git
>     a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>     b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>     index 7faeb130a..490b61f1f 100644
>     ---
>     a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>     +++
>     b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>     @@ -7,9 +7,7 @@ MIME-Version: 1.0
>      Content-Type: text/plain; charset=UTF-8
>      Content-Transfer-Encoding: 8bit
>
>     -Upstream-Status: Applied [1]
>     -
>     -[1] https://github.com/dajobe/raptor/pull/33
>     <https://urldefense.com/v3/__https://github.com/dajobe/raptor/pull/33__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53LRw0LEs4$>
>     +Upstream-Status: Backport
>     [https://github.com/dajobe/raptor/commit/e75b1dbb7f2a6514b8d391b200c45a2bec6268bf
>     <https://urldefense.com/v3/__https://github.com/dajobe/raptor/commit/e75b1dbb7f2a6514b8d391b200c45a2bec6268bf__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53LXXzgDhk$>]
>
>      Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>      ---
>     diff --git
>     a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
>     b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
>     index 99dc4e304..47eb9cfd6 100644
>     ---
>     a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
>     +++
>     b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
>     @@ -36,7 +36,7 @@ This was reported in
>      <http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html
>     <https://urldefense.com/v3/__http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53LAXmj02c$>>.
>
>      CVE: CVE-2018-1000097
>     -Upstream-Status: no upstream
>     [http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html
>     <https://urldefense.com/v3/__http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53LAXmj02c$>]
>     +Upstream-Status: Inappropriate [no upstream]
>      Signed-off-by: Petr Písař <ppisar@redhat.com>
>      Signed-off-by: Sinan Kaya <okaya@kernel.org>
>      ---
>     -- 
>     2.25.1
>
>
>     -=-=-=-=-=-=-=-=-=-=-=-
>     Links: You receive all messages sent to this group.
>     View/Reply Online (#101224):
>     https://lists.openembedded.org/g/openembedded-devel/message/101224
>     <https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-devel/message/101224__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53LyGenRZ0$>
>     Mute This Topic:
>     https://lists.openembedded.org/mt/97181611/3617156
>     <https://urldefense.com/v3/__https://lists.openembedded.org/mt/97181611/3617156__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53L61IxVcM$>
>     Group Owner: openembedded-devel+owner@lists.openembedded.org
>     <mailto:openembedded-devel%2Bowner@lists.openembedded.org>
>     Unsubscribe:
>     https://lists.openembedded.org/g/openembedded-devel/unsub
>     <https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-devel/unsub__;!!AjveYdw8EvQ!cE3DkaINahusvd5dYlzd1p1Eq6K2nj9yGi9yrZcwLs_M27CT8hzjQxRd_Obfmv_NnC4bjwMSl9MFjvEoA53L7_4KSck$>
>     [Martin.Jansa@gmail.com]
>     -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
index bf083c85f..52c9df9b1 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
+++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
@@ -15,7 +15,7 @@  src/mongo/db/stats/counters.h:185:47: error: static assertion failed: cache line
 The structure need to ensure true sharing for both the elements
 so align it to hardware_constructive_interference_size instead
 
-Upstream-Status: Reported [https://jira.mongodb.org/browse/SERVER-65664]
+Upstream-Status: Inappropriate [https://jira.mongodb.org/browse/SERVER-65664]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
index 8b73af32e..23e92885e 100644
--- a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
+++ b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
@@ -1,6 +1,6 @@ 
 Signed-off-by: Jun Zhu <R01007@freescale.com>
 
-Upstream-Status:  Not applicable
+Upstream-Status: Inappropriate [embedded specific]
 
 diff -Nru obexftp-0.23/apps.orig/obexftpd.c obexftp-0.23/apps/obexftpd.c
 --- obexftp-0.23/apps.orig/obexftpd.c	2013-11-08 10:42:20.816631583 +0800
diff --git a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
index 00f7b8674..706f2d524 100644
--- a/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
+++ b/meta-oe/recipes-devtools/lshw/files/0001-disable-docbook2man.patch
@@ -5,7 +5,7 @@  Subject: [PATCH] build: Do not build .sgml file
 
 It needs docbook2man tool which we do not have recipe for
 
-Upstream-Status: OE-Specific [needs native docbook2man tool]
+Upstream-Status: Inappropriate [needs native docbook2man tool]
 
 Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
 ---
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
index 6c585c2f5..158857ae2 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
@@ -7,7 +7,7 @@  bitbake passes CFLAGS that are often in conflict with the ones set
 in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
 FORTIFY_SOURCE=2 except in release mode
 
-Upstream-Status: Innapropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.]
+Upstream-Status: Inappropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.]
 ---
  lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
  1 file changed, 2 deletions(-)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
index e63b05356..202f12612 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
@@ -5,7 +5,7 @@  Subject: [PATCH] rust.configure: do not try to find a suitable upstream target
 
 OE is using custom targets and so this is bound to fail.
 
-Upstream-Status: Inapppropriate [oe-core specific]
+Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 
 ---
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
index afe11f353..d232f6913 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
+++ b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
@@ -3,9 +3,7 @@  From: dgod <dgod.osa@gmail.com>
 Date: Mon, 21 Mar 2016 19:25:25 +0800
 Subject: [PATCH] fix css under gtk 3.20
 
-Upstream-Status: Applied [1]
-
-[1] https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771
+Upstream-Status: Backport [https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771]
 ---
  data/themes/Industrial/gtk.css | 1 +
  1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
index 057b1fd1d..60953381a 100644
--- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
+++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
@@ -6,7 +6,7 @@  Filtered with:
   filterdiff -p1 -x README -x 'debian/*'
 
 
-Upstream-Status: unmaintained
+Upstream-Status: Inappropriate [unmaintained]
 
 Index: hddtemp-0.3-beta15/doc/hddtemp.8
 ===================================================================
diff --git a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
index ea3ddfb64..b3ee24d9d 100644
--- a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
+++ b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch
@@ -3,7 +3,7 @@  From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 27 Mar 2021 21:41:04 -0700
 Subject: [PATCH] example: Do not run the tests
 
-Upstream-Status: Inappropritate [Cross-compile specific]
+Upstream-Status: Inappropriate [Cross-compile specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  examples/Makefile | 3 ---
diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
index 7faeb130a..490b61f1f 100644
--- a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
+++ b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
@@ -7,9 +7,7 @@  MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-Upstream-Status: Applied [1]
-
-[1] https://github.com/dajobe/raptor/pull/33
+Upstream-Status: Backport [https://github.com/dajobe/raptor/commit/e75b1dbb7f2a6514b8d391b200c45a2bec6268bf]
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
diff --git a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
index 99dc4e304..47eb9cfd6 100644
--- a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
+++ b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch
@@ -36,7 +36,7 @@  This was reported in
 <http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html>.
 
 CVE: CVE-2018-1000097
-Upstream-Status: no upstream [http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html]
+Upstream-Status: Inappropriate [no upstream]
 Signed-off-by: Petr Písař <ppisar@redhat.com>
 Signed-off-by: Sinan Kaya <okaya@kernel.org>
 ---