diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-11-07 12:04:35 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-07 12:05:31 -0800 |
commit | 8a8808315008ae0fc82f357697180ed8a096d250 (patch) | |
tree | 9b733728b64b772a3cd75b16b65e4510b17c406f /meta-networking/recipes-connectivity | |
parent | 317412bd161a566072b78af0e484410ecd702d8e (diff) | |
download | meta-openembedded-8a8808315008ae0fc82f357697180ed8a096d250.tar.gz |
networkmanager: Fix build with musl
Remove redundant header includes
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
2 files changed, 54 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch new file mode 100644 index 000000000..0c415bce7 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From 3f4b6319701834182304c4079119780f4ae5b49b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 7 Nov 2018 11:30:44 -0800 | ||
4 | Subject: [PATCH] Do not include net/ethernet.h and linux/if_ether.h | ||
5 | |||
6 | They conflict when used together especially with musl | ||
7 | removing them still keeps it working so it seems they are redundant | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | shared/n-acd/src/n-acd.c | 1 - | ||
12 | src/platform/wpan/nm-wpan-utils.h | 2 -- | ||
13 | src/settings/nm-settings-connection.h | 2 -- | ||
14 | 3 files changed, 5 deletions(-) | ||
15 | |||
16 | diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c | ||
17 | index 9164f95..9538e50 100644 | ||
18 | --- a/shared/n-acd/src/n-acd.c | ||
19 | +++ b/shared/n-acd/src/n-acd.c | ||
20 | @@ -23,7 +23,6 @@ | ||
21 | #include <errno.h> | ||
22 | #include <limits.h> | ||
23 | #include <linux/filter.h> | ||
24 | -#include <linux/if_ether.h> | ||
25 | #include <linux/if_packet.h> | ||
26 | #include <net/ethernet.h> | ||
27 | #include <netinet/if_ether.h> | ||
28 | diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h | ||
29 | index f7d0c03..e1c81f5 100644 | ||
30 | --- a/src/platform/wpan/nm-wpan-utils.h | ||
31 | +++ b/src/platform/wpan/nm-wpan-utils.h | ||
32 | @@ -20,8 +20,6 @@ | ||
33 | #ifndef __WPAN_UTILS_H__ | ||
34 | #define __WPAN_UTILS_H__ | ||
35 | |||
36 | -#include <net/ethernet.h> | ||
37 | - | ||
38 | #include "nm-dbus-interface.h" | ||
39 | #include "platform/nm-netlink.h" | ||
40 | |||
41 | diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h | ||
42 | index e796b71..c01fef6 100644 | ||
43 | --- a/src/settings/nm-settings-connection.h | ||
44 | +++ b/src/settings/nm-settings-connection.h | ||
45 | @@ -22,8 +22,6 @@ | ||
46 | #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__ | ||
47 | #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__ | ||
48 | |||
49 | -#include <net/ethernet.h> | ||
50 | - | ||
51 | #include "nm-dbus-object.h" | ||
52 | #include "nm-connection.h" | ||
53 | |||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb index 3ce2a2f89..348ce9e7a 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb | |||
@@ -28,6 +28,7 @@ SRC_URI = " \ | |||
28 | file://0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ | 28 | file://0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ |
29 | file://0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ | 29 | file://0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ |
30 | file://0003-Do-not-create-settings-settings-property-documentati.patch \ | 30 | file://0003-Do-not-create-settings-settings-property-documentati.patch \ |
31 | file://0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch \ | ||
31 | file://musl/0001-musl-basic.patch \ | 32 | file://musl/0001-musl-basic.patch \ |
32 | file://musl/0002-musl-dlopen-configure-ac.patch \ | 33 | file://musl/0002-musl-dlopen-configure-ac.patch \ |
33 | file://musl/0003-musl-network-support.patch \ | 34 | file://musl/0003-musl-network-support.patch \ |