From 3820c85c24ae0a6d1291cd863b0a673566aae65c Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 26 Sep 2014 12:35:11 +0200 Subject: networkmanager update to 0.9.8.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * use nss as default crypto engine to get out of blacklist due to missing gcrypt Signed-off-by: Andreas Müller --- ...ger.service-remove-reference-to-NetworkMa.patch | 32 ------ .../networkmanager/networkmanager_0.9.8.0.bb | 113 --------------------- .../networkmanager/networkmanager_0.9.8.10.bb | 110 ++++++++++++++++++++ 3 files changed, 110 insertions(+), 145 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-NetworkManager.service-remove-reference-to-NetworkMa.patch delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-NetworkManager.service-remove-reference-to-NetworkMa.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-NetworkManager.service-remove-reference-to-NetworkMa.patch deleted file mode 100644 index bbcd021c13..0000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-NetworkManager.service-remove-reference-to-NetworkMa.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1137846f778dc9f3be0c89cb2df18d3a37f844d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 19 Apr 2013 18:34:09 +0200 -Subject: [PATCH] NetworkManager.service: remove reference to - NetworkManager-wait-online.service -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* NetworkManager-wait-online.service crashes -* NetworkManager works fine without NetworkManager-wait-online - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Andreas Müller ---- - data/NetworkManager.service.in | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 16b53b6..a2e913c 100644 ---- a/data/NetworkManager.service.in -+++ b/data/NetworkManager.service.in -@@ -18,5 +18,4 @@ KillMode=process - [Install] - WantedBy=multi-user.target - Alias=dbus-org.freedesktop.NetworkManager.service --Also=NetworkManager-wait-online.service - --- -1.7.4.4 - diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb deleted file mode 100644 index bdda59c040..0000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb +++ /dev/null @@ -1,113 +0,0 @@ -SUMMARY = "NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" - -DEPENDS = "libnl dbus dbus-glib udev wireless-tools gnutls util-linux ppp" - -PNBLACKLIST[networkmanager] = "BROKEN: needs to detect gcrypt from pkg-config (error: gnutls explicitly requested but gcrypt not found on system)" - -inherit gnome gettext systemd - -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-NetworkManager.service-remove-reference-to-NetworkMa.patch \ - file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ -" -SRC_URI[md5sum] = "38d28f6bd9220d85dfff47210706195c" -SRC_URI[sha256sum] = "c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b" - - -S = "${WORKDIR}/NetworkManager-${PV}" - -EXTRA_OECONF = " \ - --enable-ifupdown \ - --disable-ifcfg-rh \ - --disable-ifnet \ - --disable-ifcfg-suse \ - --with-netconfig \ - --with-crypto=gnutls \ - --disable-more-warnings \ - --with-dhclient=${base_sbindir}/dhclient \ - --with-iptables=${sbindir}/iptables \ - --with-tests \ -" - -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ - --without-systemdsystemunitdir, \ - polkit \ -" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,libsoup-2.4" - -# Work around dbus permission problems since we lack a proper at_console -do_install_prepend() { - sed -i 's:deny send_destination:allow send_destination:g' ${S}/src/org.freedesktop.NetworkManager.conf - sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dispatcher.conf - sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dhcp-client.conf - sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-avahi-autoipd.conf -} - -do_install_append () { - install -d ${D}${sysconfdir}/dbus-1/event.d - # Additional test binaries - install -d ${D}${bindir} - install -m 0755 ${B}/test/.libs/libnm* ${D}${bindir} - - # Install an empty VPN folder as nm-connection-editor will happily segfault without it :o. - # With or without VPN support built in ;). - install -d ${D}${sysconfdir}/NetworkManager/VPN - - rm -rf "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" -} - -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion" - -FILES_libnmutil += "${libdir}/libnm-util.so.*" -FILES_libnmglib += "${libdir}/libnm-glib.so.*" -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" - -FILES_${PN} += " \ - ${libexecdir} \ - ${libdir}/pppd/*/nm-pppd-plugin.so \ - ${libdir}/NetworkManager/*.so \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${base_libdir}/udev/* \ - ${systemd_unitdir}/system/NetworkManager-wait-online.service \ -" - -RRECOMMENDS_${PN} += "iptables" -RCONFLICTS_${PN} = "connman" -RDEPENDS_${PN} = " \ - wpa-supplicant \ - dhcp-client \ - ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \ -" - -FILES_${PN}-dbg += " \ - ${libdir}/NetworkManager/.debug/ \ - ${libdir}/pppd/*/.debug/ \ -" - -FILES_${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ -" - -FILES_${PN}-tests = " \ - ${bindir}/nm-tool \ - ${bindir}/libnm-glib-test \ - ${bindir}/nm-online \ -" - -FILES_${PN}-bash-completion = "${datadir}/bash-completion" - -SYSTEMD_SERVICE_${PN} = "NetworkManager.service" diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb new file mode 100644 index 0000000000..0792e8ed17 --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb @@ -0,0 +1,110 @@ +SUMMARY = "NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" + +DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux ppp" + +inherit gnome gettext systemd + +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://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ +" +SRC_URI[md5sum] = "aad2558887e25417c52eb2deaade2f85" +SRC_URI[sha256sum] = "064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972" + + +S = "${WORKDIR}/NetworkManager-${PV}" + +EXTRA_OECONF = " \ + --enable-ifupdown \ + --disable-ifcfg-rh \ + --disable-ifnet \ + --disable-ifcfg-suse \ + --with-netconfig \ + --with-crypto=nss \ + --disable-more-warnings \ + --with-dhclient=${base_sbindir}/dhclient \ + --with-iptables=${sbindir}/iptables \ + --with-tests \ +" + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" +PACKAGECONFIG[systemd] = " \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ + --without-systemdsystemunitdir, \ + polkit \ +" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" +PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,libsoup-2.4" + +# Work around dbus permission problems since we lack a proper at_console +do_install_prepend() { + sed -i 's:deny send_destination:allow send_destination:g' ${S}/src/org.freedesktop.NetworkManager.conf + sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dispatcher.conf + sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dhcp-client.conf + sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-avahi-autoipd.conf +} + +do_install_append () { + install -d ${D}${sysconfdir}/dbus-1/event.d + # Additional test binaries + install -d ${D}${bindir} + install -m 0755 ${B}/test/.libs/libnm* ${D}${bindir} + + # Install an empty VPN folder as nm-connection-editor will happily segfault without it :o. + # With or without VPN support built in ;). + install -d ${D}${sysconfdir}/NetworkManager/VPN + + rm -rf "${D}${localstatedir}/run" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" +} + +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion" + +FILES_libnmutil += "${libdir}/libnm-util.so.*" +FILES_libnmglib += "${libdir}/libnm-glib.so.*" +FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ + ${libdir}/NetworkManager/*.so \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${base_libdir}/udev/* \ + ${systemd_unitdir}/system/NetworkManager-wait-online.service \ +" + +RRECOMMENDS_${PN} += "iptables" +RCONFLICTS_${PN} = "connman" +RDEPENDS_${PN} = " \ + wpa-supplicant \ + dhcp-client \ + ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \ +" + +FILES_${PN}-dbg += " \ + ${libdir}/NetworkManager/.debug/ \ + ${libdir}/pppd/*/.debug/ \ +" + +FILES_${PN}-dev += " \ + ${datadir}/NetworkManager/gdb-cmd \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ +" + +FILES_${PN}-tests = " \ + ${bindir}/nm-tool \ + ${bindir}/libnm-glib-test \ + ${bindir}/nm-online \ +" + +FILES_${PN}-bash-completion = "${datadir}/bash-completion" + +SYSTEMD_SERVICE_${PN} = "NetworkManager.service" -- cgit v1.2.3-54-g00ecf