[oe] [meta-oe][PATCH] networkmanager upgrade to 1.10.6
Khem Raj
raj.khem at gmail.com
Tue Mar 20 22:02:48 UTC 2018
On Tue, Mar 20, 2018 at 2:57 PM, Andreas Müller <schnitzeltony at gmail.com> wrote:
> On Thu, Mar 15, 2018 at 3:33 PM, Andreas Müller <schnitzeltony at gmail.com> wrote:
>> On Tue, Mar 13, 2018 at 11:20 PM, Pablo Saavedra <psaavedra at igalia.com> wrote:
>>> * Upgraded to latest stable version [1]
>>> * Forward-port of the Yocto patches
>>> * Disabled 0004-Define-missing-features-to-cater-for-musl.patch
>>> * This version keeps fixed 'Fixed setting 802-1x.password-raw
>>> property in nmcli' error. Fixed on 1.6.4 [2].
>>>
>>> References:
>>>
>>> [1] https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/NEWS?h=nm-1-10
>>> [2] https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/NEWS?h=1.6.4#n11
>>>
>>> Signed-off-by: Pablo Saavedra <psaavedra at igalia.com>
>>> ---
>>> ...adjust-net-headers-for-musl-compatibility.patch | 32 +-
>>> ...dns-resolved-add-systemd-resolved-backend.patch | 621 ---------------------
>>> ...ed-also-check-for-etc-resolv-conf.systemd.patch | 29 -
>>> ...o-run-sbin-dhclient-to-get-the-version-nu.patch | 36 --
>>> ...stemd-xlocale.h-is-dropped-by-newer-glibc.patch | 29 -
>>> .../0002-Fix-nm-version-macro-includes.patch | 58 --
>>> ...et-util.h-Include-linux-sockios.h-on-musl.patch | 14 +-
>>> ...-string-in-g_dbus_message_new_method_erro.patch | 67 ---
>>> .../networkmanager/0003-Define-ETH_ALEN.patch | 10 +-
>>> ...Define-missing-features-to-cater-for-musl.patch | 41 +-
>>> ...emove-net-ethernet.h-seems-to-be-over-spe.patch | 44 +-
>>> ... 0006-check-for-strndupa-before-using-it.patch} | 22 +-
>>> ...figure.ac-Fix-pkgconfig-sysroot-locations.patch | 25 +
>>> ...rkmanager_1.4.4.bb => networkmanager_1.10.6.bb} | 21 +-
>>> 14 files changed, 119 insertions(+), 930 deletions(-)
>>> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch
>>> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch
>>> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
>>> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch
>>> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch
>>> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch
>>> rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0001-check-for-strndupa-before-using-it.patch => 0006-check-for-strndupa-before-using-it.patch} (77%)
>>> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
>>> rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.4.4.bb => networkmanager_1.10.6.bb} (81%)
>>>
>>> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
>>> similarity index 81%
>>> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
>>> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
>>> index d5f456f37..6538e7b82 100644
>>> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
>>> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
>>> @@ -5,7 +5,7 @@ SECTION = "net/misc"
>>> LICENSE = "GPLv2+"
>>> LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
>>> file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
>>> - file://docs/api/html/license.html;md5=8eb8e72bab097b9d11763002cb003697 \
>>> + file://docs/api/html/license.html;md5=77b9e362690c149da196aefe7712db30 \
>>> "
>>>
>>> DEPENDS = " \
>>> @@ -20,6 +20,7 @@ DEPENDS = " \
>>> libnewt \
>>> polkit \
>>> jansson \
>>> + curl \
>>> "
>>>
>>> inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection
>>> @@ -27,21 +28,15 @@ inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introsp
>>> GI_DATA_ENABLED_libc-musl = "False"
>>>
>>> SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
>>> - file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
>>> - file://0002-Fix-nm-version-macro-includes.patch \
>>> file://0001-adjust-net-headers-for-musl-compatibility.patch \
>>> file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \
>>> file://0003-Define-ETH_ALEN.patch \
>>> - file://0004-Define-missing-features-to-cater-for-musl.patch \
>>> file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
>>> - file://0001-check-for-strndupa-before-using-it.patch \
>>> - file://0001-dns-resolved-add-systemd-resolved-backend.patch \
>>> - file://0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch \
>>> - file://0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch \
>>> - file://0002-user-format-string-in-g_dbus_message_new_method_erro.patch \
>>> + file://0006-check-for-strndupa-before-using-it.patch \
>>> + file://0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
>>> "
>>> -SRC_URI[md5sum] = "63f1e0d6d7e9099499d062c84c927a75"
>>> -SRC_URI[sha256sum] = "829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309"
>>> +SRC_URI[md5sum] = "de3c7147a693da6f80eb22f126086a14"
>>> +SRC_URI[sha256sum] = "6af0b1e856a3725f88791f55c4fbb04105dc0b20dbf182aaec8aad16481fac76"
>>>
>>> S = "${WORKDIR}/NetworkManager-${PV}"
>>>
>>> @@ -49,6 +44,7 @@ EXTRA_OECONF = " \
>>> --disable-ifcfg-rh \
>>> --disable-ifnet \
>>> --disable-ifcfg-suse \
>>> + --disable-introspection \
>> ^ Why disable introspection?
>>> --disable-more-warnings \
>>> --with-iptables=${sbindir}/iptables \
>>> --with-tests \
>>> @@ -73,7 +69,6 @@ PACKAGECONFIG[systemd] = " \
>>> PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
>>> # consolekit is not picked by shlibs, so add it to RDEPENDS too
>>> PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
>>> -PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
>>> PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
>>> PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
>>> # Use full featured dhcp client instead of internal one
>>> @@ -101,6 +96,8 @@ FILES_${PN} += " \
>>> ${libexecdir} \
>>> ${libdir}/pppd/*/nm-pppd-plugin.so \
>>> ${libdir}/NetworkManager/*.so \
>>> + ${libdir}/NetworkManager/VPN \
>>> + ${libdir}/NetworkManager/conf.d \
>>> ${datadir}/polkit-1 \
>>> ${datadir}/dbus-1 \
>>> ${base_libdir}/udev/* \
>>> --
>>> 2.11.0
>>>
> Just build tested this patch: It breaks networkmanager-applet. From
> the first glance it seems error is caused by missing introspection -
> but I have to update nm-applet to check further.
>
> Suggestion: I take care of nm-applet-update/introspection (based on
> this patch - or do you have V2 close to send?) and you (and/or Khem)
> take care of musl?
I can help with musl once we have other regressions fixed.
>
> Andreas
More information about the Openembedded-devel
mailing list