Re: [meta-networking][PATCH] networkmanager: Update to 1.18.0

[Khem Raj <raj.khem@gmail.com>]

Hi Andrei

The musl patches need to be forward ported as well. They dont apply
cleanly anymore on top of this update.

On Wed, May 22, 2019 at 6:14 AM Andrei Gherzan <andrei@gherzan.ro> wrote:
>
> One patch was dropped (0003-dlopen-failure.patch) as a similar one was
> merged upstream. See:
> https://github.com/NetworkManager/NetworkManager/commit/bd4957fcd78a0e64d26459e94ab3b84c91cd6f5f
>
> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> ---
>  .../networkmanager/0003-dlopen-failure.patch  | 34 -------------------
>  ...ger_1.16.0.bb => networkmanager_1.18.0.bb} |  6 ++--
>  2 files changed, 2 insertions(+), 38 deletions(-)
>  delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch
>  rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.16.0.bb => networkmanager_1.18.0.bb} (96%)
>
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch
> deleted file mode 100644
> index e99c22710..000000000
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> -Date: Thu, 22 Mar 2018 18:18:06 +0100
> -Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of
> - LD_LIBS="none required"
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Pending
> -
> -Stolen from [1] and prettyfied slightly
> -
> -[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ----
> - configure.ac | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 487a266..96ae4f7 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -235,6 +235,7 @@ dnl
> - dnl Checks for libdl - on certain platforms its part of libc
> - dnl
> - AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
> -+AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""])
> - AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
> -
> - PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
> ---
> -2.14.3
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb
> similarity index 96%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb
> index 9f01f1bc1..9215a8676 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb
> @@ -26,15 +26,13 @@ SRC_URI = " \
>      ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
>      file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
>      file://0002-Do-not-create-settings-settings-property-documentati.patch \
> -    file://0003-dlopen-failure.patch \
>  "
>  SRC_URI_append_libc-musl = " \
>      file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
>      file://musl/0002-Fix-build-with-musl.patch \
>  "
> -
> -SRC_URI[md5sum] = "10abacaafb162a67d2942adf03e7e9e4"
> -SRC_URI[sha256sum] = "8e962833b6ca03edda1bc57ed6614a7b8c2339531b44acef098d05f2324c5d2c"
> +SRC_URI[md5sum] = "c8c27116a8083bab5d5fcca0d03e988a"
> +SRC_URI[sha256sum] = "c6e8df25e5a3c7309bc17664be8971689314884cdd08afdd6b0847d29d2a8ba6"
>
>  UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.16/"
>  UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P<pver>1\.10(\.\d+)+).tar.xz"
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel