diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2015-06-15 11:50:55 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-07-16 21:09:04 +0200 |
commit | dd9d09945da519fa67a5da61b48c4ddd534f078a (patch) | |
tree | 0c64b8d9767d4a3486fbd23b59c39562f7d5793a /meta-oe | |
parent | 0022a5e9a991beb4c10bb0e1bf21bc93a230bb84 (diff) | |
download | meta-openembedded-contrib-dd9d09945da519fa67a5da61b48c4ddd534f078a.tar.gz |
networkmanager: update to 1.0.2
* at_console support is gone
* add PACKAGECONFIG for bluez5/modemmanager/ppp and disable them by default
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb (renamed from meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb) | 41 |
2 files changed, 8 insertions, 63 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch deleted file mode 100644 index e356e9b25b..0000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 10427a19302e871daeeb245581e930dc58195492 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 27 Feb 2014 12:59:03 +0100 -Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login - -* they were merged into libsystemd in systemd-209 - -Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this) - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index cc66e9b..3fe958e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -283,7 +283,7 @@ AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$" - AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit") - AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "xwith_session_tracking" = "systemd") - if test "$with_session_tracking" = "systemd"; then -- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login]) -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd]) - AC_SUBST(SYSTEMD_LOGIN_CFLAGS) - AC_SUBST(SYSTEMD_LOGIN_LIBS) - fi --- -1.9.0 - diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb index 8d37c980e0..324d1658e4 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb @@ -4,18 +4,16 @@ SECTION = "net/misc" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" -DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux ppp" +DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux libndp" 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" - +SRC_URI[md5sum] = "5a4899f89edcbdd1ac46d2d947e8d6eb" +SRC_URI[sha256sum] = "359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff" S = "${WORKDIR}/NetworkManager-${PV}" @@ -40,30 +38,11 @@ PACKAGECONFIG[systemd] = " \ polkit \ " # consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" 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}" -} +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" PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion" @@ -78,7 +57,7 @@ FILES_${PN} += " \ ${datadir}/polkit-1 \ ${datadir}/dbus-1 \ ${base_libdir}/udev/* \ - ${systemd_unitdir}/system/NetworkManager-wait-online.service \ + ${systemd_unitdir}/system \ " RRECOMMENDS_${PN} += "iptables dnsmasq" @@ -86,7 +65,6 @@ RCONFLICTS_${PN} = "connman" RDEPENDS_${PN} = " \ wpa-supplicant \ dhcp-client \ - ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \ " FILES_${PN}-dbg += " \ @@ -95,14 +73,11 @@ FILES_${PN}-dbg += " \ " 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 \ " |