diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2022-05-04 11:44:16 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-05-04 21:28:21 -0700 |
commit | dedf55890abd21a198e16fca59ab8c7e5ff2ce62 (patch) | |
tree | a0188a17dac3105843c360a4a7f186d46bc4a95c /meta-networking/recipes-connectivity/networkmanager | |
parent | f850d140d7902e3b03ca545bbd419e0a9ed8f30e (diff) | |
download | meta-openembedded-dedf55890abd21a198e16fca59ab8c7e5ff2ce62.tar.gz |
networkmanager: fix parallel build failure
Add dependency libnm_client_public_dep to libnm-client-test to fix
parallel build error:
| In file included from ../NetworkManager-1.36.0/src/libnm-client-test/nm-test-utils-impl.c:10:
| ../NetworkManager-1.36.0/src/libnm-client-public/NetworkManager.h:47:10: fatal error: nm-enum-types.h: No such file or directory
| 47 | #include "nm-enum-types.h"
| | ^~~~~~~~~~~~~~~~~
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/networkmanager')
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch new file mode 100644 index 0000000000..6be2d4bed1 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 7b5dc04e1fcc28dc653fb7bf0e9dda3700d93218 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Tue, 3 May 2022 15:30:37 +0800 | ||
4 | Subject: [PATCH] libnm-client-test: add dependency libnm_client_public_dep | ||
5 | |||
6 | Fix parallel build error: | ||
7 | | In file included from ../NetworkManager-1.36.0/src/libnm-client-test/nm-test-utils-impl.c:10: | ||
8 | | ../NetworkManager-1.36.0/src/libnm-client-public/NetworkManager.h:47:10: fatal error: nm-enum-types.h: No such file or directory | ||
9 | | 47 | #include "nm-enum-types.h" | ||
10 | | | ^~~~~~~~~~~~~~~~~ | ||
11 | |||
12 | Upstream-Status: Submitted | ||
13 | [https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1206] | ||
14 | |||
15 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
16 | --- | ||
17 | src/libnm-client-test/meson.build | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/src/libnm-client-test/meson.build b/src/libnm-client-test/meson.build | ||
21 | index 8e2fba1130..bcac437702 100644 | ||
22 | --- a/src/libnm-client-test/meson.build | ||
23 | +++ b/src/libnm-client-test/meson.build | ||
24 | @@ -13,6 +13,7 @@ libnm_client_test = static_library( | ||
25 | ], | ||
26 | dependencies: [ | ||
27 | libnm_core_public_dep, | ||
28 | + libnm_client_public_dep, | ||
29 | glib_dep, | ||
30 | ], | ||
31 | ) | ||
32 | -- | ||
33 | 2.25.1 | ||
34 | |||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb index b09ff18bf7..6c665d53bb 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb | |||
@@ -29,6 +29,7 @@ SRC_URI = " \ | |||
29 | file://enable-dhcpcd.conf \ | 29 | file://enable-dhcpcd.conf \ |
30 | file://enable-iwd.conf \ | 30 | file://enable-iwd.conf \ |
31 | file://0001-do-not-ask-host-for-ifcfg-defaults.patch \ | 31 | file://0001-do-not-ask-host-for-ifcfg-defaults.patch \ |
32 | file://0001-libnm-client-test-add-dependency-libnm_client_public.patch \ | ||
32 | " | 33 | " |
33 | SRC_URI[sha256sum] = "ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab" | 34 | SRC_URI[sha256sum] = "ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab" |
34 | 35 | ||