diff options
Diffstat (limited to 'meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch')
| -rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch index ced0c7cfff..194e037227 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch @@ -1,21 +1,21 @@ -From 047d3bf96b510740f64687480333c378e414995f Mon Sep 17 00:00:00 2001 +From f81abf62c0ae93628df36c27357358523be25fb8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 15:57:05 -0700 -Subject: [PATCH 1/5] adjust net/ headers for musl compatibility +Subject: [PATCH 1/7] adjust net/ headers for musl compatibility Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - libnm-core/nm-utils.c | 12 +++++++----- + libnm-core/nm-utils.c | 13 ++++++++----- libnm-core/nm-utils.h | 5 ++--- src/platform/wifi/wifi-utils.h | 2 +- - 3 files changed, 10 insertions(+), 9 deletions(-) + 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c -index df75d56..868224e 100644 +index ebbbfd3..77273df 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c -@@ -19,24 +19,26 @@ - * Copyright 2005 - 2014 Red Hat, Inc. +@@ -19,14 +19,9 @@ + * Copyright 2005 - 2017 Red Hat, Inc. */ -#include "nm-default.h" @@ -29,25 +29,29 @@ index df75d56..868224e 100644 #include <arpa/inet.h> #include <uuid/uuid.h> #include <libintl.h> - #include <gmodule.h> +@@ -34,12 +29,20 @@ #include <sys/stat.h> + #include <net/if.h> + #include <linux/pkt_sched.h> +//#include <net/if_arp.h> +//#include <net/ethernet.h> +#include <netinet/ether.h> + +#include "nm-default.h" - ++ +#include "nm-utils.h" + #if WITH_JANSSON + #include "nm-json.h" #include <jansson.h> #endif + + #include "nm-utils/nm-enum-utils.h" + #include "nm-utils/nm-hash-utils.h" #include "nm-common-macros.h" - #include "nm-utils-private.h" - #include "nm-setting-private.h" diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 407c14e..156ccae 100644 +index df9284b..02e24ea 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -27,11 +27,10 @@ @@ -65,7 +69,7 @@ index 407c14e..156ccae 100644 #include "nm-core-enum-types.h" #include "nm-setting-wireless-security.h" diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h -index 8e2b93f..84f5ce9 100644 +index 705717b..939080f 100644 --- a/src/platform/wifi/wifi-utils.h +++ b/src/platform/wifi/wifi-utils.h @@ -22,7 +22,7 @@ @@ -78,5 +82,5 @@ index 8e2b93f..84f5ce9 100644 #include "nm-dbus-interface.h" -- -2.12.1 +2.14.1 |