diff --git a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch b/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch deleted file mode 100644 index 9fd0a172e05d22a21390efe02bda02d5a5ec495b..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c992f460c74bee491f831a21326f51c907376ebf Mon Sep 17 00:00:00 2001 -From: Leo <thinkabit.ukim@gmail.com> -Date: Thu, 10 Dec 2020 08:10:40 -0300 -Subject: [PATCH] build: check for reallocarray in stdlib.h - -Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> -Upstream-status: Backport - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index f86cda69ac0..8fd65d13713 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -83,6 +83,7 @@ AC_CHECK_DECLS([ - reallocarray], - [], [], [[ - #include <malloc.h> -+#include <stdlib.h> - ]]) - - AC_CHECK_DECLS([ diff --git a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch.license b/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch.license deleted file mode 100644 index 98a0b3f4a5b8db268215a128c7d06e0a10897e73..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-reallocarray-check.patch.license +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 diff --git a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch b/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch deleted file mode 100644 index c284f75e7e863413684d6be7cb3a8cadb66908dc..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 18765456467af24786bc2397ca72affe42149504 Wed Sep 8 22:33:40 2021 -From: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com> -Date: Wed, 8 Sep 2021 22:33:40 +0200 -Subject: [PATCH] Fix crash on startup when using musl - -nm_strerror_native_r makes use of a glibc extension to strerror_r -when _GNU_SOURCE is defined -- even when not using glibc. - -musl uses _GNU_SOURCE for some extensions, but doesn't have the -strerror_r for unknown error codes extension -- resulting in a -NULL pointer being passed to UTF-8 check functions that don't -check for it. - -Use the non-glibc code path when __GLIBC__ isn't set. - -Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com> -Upstream-status: Inappropriate [problem doesn't exist in current releases] - ---- - nm-errno.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff -up NetworkManager-1.22.10/shared/nm-glib-aux/nm-errno.c.omv~ NetworkManager-1.22.10/shared/nm-glib-aux/nm-errno.c ---- NetworkManager-1.22.10/shared/nm-glib-aux/nm-errno.c.omv~ 2021-09-08 22:10:10.753007649 +0200 -+++ NetworkManager-1.22.10/shared/nm-glib-aux/nm-errno.c 2021-09-08 22:18:11.975338808 +0200 -@@ -106,7 +106,7 @@ nm_strerror_native_r (int errsv, char *b - nm_assert (buf); - nm_assert (buf_size > 0); - --#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE -+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) - /* XSI-compliant */ - { - int errno_saved = errno; diff --git a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch.license b/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch.license deleted file mode 100644 index 98a0b3f4a5b8db268215a128c7d06e0a10897e73..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager-1.22.10/fix-strerror_r.patch.license +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 diff --git a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bbappend b/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bbappend deleted file mode 100644 index 346b60e7f655329e051a91f5658917e8f2b589ed..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/dynamic-layers/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" - -SRC_URI_append = " file://fix-reallocarray-check.patch \ - file://fix-strerror_r.patch \ -"