On 04/09/2018 03:02 PM, Andreas Müller wrote:
> This adresses the comments for recent patch which updated nm to 1.10.6 and is
> a
> follow-up for [1].
There is a form of this already in my stagging/master-next. Should it
be removed and replaced by this one?
- armin
>
> * Make gobject-introspection work by skipping creation of
> gobject-introspection
> specific documentation. This fixes networkmanager-applet regression.
> * Cleanup patches: Remove current musl patches completely and re-use those
> found in void-linux because they do look much cleaner and don't touch glibc
> build. One nice side effect: In the future when nm is updated we can steal
> again and don't need to reenvent here. Usually they are much faster than we
> are (and I know one major contibutor personally from the good old Z80
> times..)
>
> [1] https://patchwork.openembedded.org/patch/149244/
>
> Signed-off-by: Andreas Müller
> ---
> ...adjust-net-headers-for-musl-compatibility.patch | 86
> ...move-net-ethernet.h-seems-to-be-over-spe.patch} | 0
> ...igure.ac-Fix-pkgconfig-sysroot-locations.patch} | 0
> ...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 ---
> .../networkmanager/0003-Define-ETH_ALEN.patch | 39 -
> ...te-settings-settings-property-documentati.patch | 77 ++
> ...Define-missing-features-to-cater-for-musl.patch | 92
> --
> .../0006-check-for-strndupa-before-using-it.patch | 67
> .../networkmanager/musl/0001-musl-basic.patch | 53 +
> .../musl/0002-musl-dlopen-configure-ac.patch | 35
> .../musl/0003-musl-network-support.patch | 72 +
> .../musl/0004-musl-process-util.patch | 62 +++
> .../networkmanager/networkmanager_1.10.6.bb| 31
> 13 files changed, 316 insertions(+), 328 deletions(-)
> delete mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
> rename
> meta-networking/recipes-connectivity/networkmanager/networkmanager/{0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
> => 0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} (100%)
> rename
> meta-networking/recipes-connectivity/networkmanager/networkmanager/{0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> => 0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} (100%)
> delete mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
> delete mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
> create mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
> delete mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
> delete mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch
> create mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
> create mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
> create mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
> create mode 100644
> meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
>
> 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
> deleted file mode 100644
> index 194e03722..0
> ---
> a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
> +++ /dev/null
> @@ -1,86 +0,0 @@
> -From f81abf62c0ae93628df36c27357358523be25fb8 Mon Sep 17 00:00:00 2001
> -From: Khem Raj
> -Date: Fri, 31 Mar 2017 15:57:05 -0700
> -Subject: [PATCH 1/7] adjust net/ headers for musl compatibility
> -
> -Signed-off-by: Khem Raj
>
> - libnm-core/nm-utils.c | 13 -
> - libnm-core/nm-utils.h | 5 ++---
> - src/platform/wifi/wifi-utils.h | 2 +-
> - 3 files changed, 11 insertions(+), 9 deletions(-)
> -
> -diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
> -index ebbbfd3..77273df 100644
> a/libnm-core/nm-utils.c
> -+++ b/libnm-core/nm-utils.c
> -@@ -19,14 +19,9 @@
> - * Copyright 2005 - 2017 Red Hat, Inc.
> - */
> -
> --#include "nm-default.h"
> --
> --#include "nm-utils.h"
> --
> - #include
> - #include
> - #include
> --
