summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2015-06-15 11:50:55 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-07-16 21:09:04 +0200
commitdd9d09945da519fa67a5da61b48c4ddd534f078a (patch)
tree0c64b8d9767d4a3486fbd23b59c39562f7d5793a /meta-oe/recipes-connectivity
parent0022a5e9a991beb4c10bb0e1bf21bc93a230bb84 (diff)
downloadmeta-openembedded-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/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch30
-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 e356e9b25..000000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 10427a19302e871daeeb245581e930dc58195492 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 27 Feb 2014 12:59:03 +0100
4Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login
5
6* they were merged into libsystemd in systemd-209
7
8Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this)
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index cc66e9b..3fe958e 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -283,7 +283,7 @@ AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$"
20 AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit")
21 AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "xwith_session_tracking" = "systemd")
22 if test "$with_session_tracking" = "systemd"; then
23- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])
24+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd])
25 AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
26 AC_SUBST(SYSTEMD_LOGIN_LIBS)
27 fi
28--
291.9.0
30
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 8d37c980e..324d1658e 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"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" 5LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
6 6
7DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux ppp" 7DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux libndp"
8 8
9inherit gnome gettext systemd 9inherit gnome gettext systemd
10 10
11SRC_URI = " \ 11SRC_URI = " \
12 ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ 12 ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
13 file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ 13 file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
14 file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \
15" 14"
16SRC_URI[md5sum] = "aad2558887e25417c52eb2deaade2f85" 15SRC_URI[md5sum] = "5a4899f89edcbdd1ac46d2d947e8d6eb"
17SRC_URI[sha256sum] = "064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972" 16SRC_URI[sha256sum] = "359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff"
18
19 17
20S = "${WORKDIR}/NetworkManager-${PV}" 18S = "${WORKDIR}/NetworkManager-${PV}"
21 19
@@ -40,30 +38,11 @@ PACKAGECONFIG[systemd] = " \
40 polkit \ 38 polkit \
41" 39"
42# consolekit is not picked by shlibs, so add it to RDEPENDS too 40# consolekit is not picked by shlibs, so add it to RDEPENDS too
41PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
43PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" 42PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
44PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,libsoup-2.4" 43PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
45 44PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
46# Work around dbus permission problems since we lack a proper at_console 45PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
47do_install_prepend() {
48 sed -i 's:deny send_destination:allow send_destination:g' ${S}/src/org.freedesktop.NetworkManager.conf
49 sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dispatcher.conf
50 sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dhcp-client.conf
51 sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-avahi-autoipd.conf
52}
53
54do_install_append () {
55 install -d ${D}${sysconfdir}/dbus-1/event.d
56 # Additional test binaries
57 install -d ${D}${bindir}
58 install -m 0755 ${B}/test/.libs/libnm* ${D}${bindir}
59
60 # Install an empty VPN folder as nm-connection-editor will happily segfault without it :o.
61 # With or without VPN support built in ;).
62 install -d ${D}${sysconfdir}/NetworkManager/VPN
63
64 rm -rf "${D}${localstatedir}/run"
65 rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
66}
67 46
68PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion" 47PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion"
69 48
@@ -78,7 +57,7 @@ FILES_${PN} += " \
78 ${datadir}/polkit-1 \ 57 ${datadir}/polkit-1 \
79 ${datadir}/dbus-1 \ 58 ${datadir}/dbus-1 \
80 ${base_libdir}/udev/* \ 59 ${base_libdir}/udev/* \
81 ${systemd_unitdir}/system/NetworkManager-wait-online.service \ 60 ${systemd_unitdir}/system \
82" 61"
83 62
84RRECOMMENDS_${PN} += "iptables dnsmasq" 63RRECOMMENDS_${PN} += "iptables dnsmasq"
@@ -86,7 +65,6 @@ RCONFLICTS_${PN} = "connman"
86RDEPENDS_${PN} = " \ 65RDEPENDS_${PN} = " \
87 wpa-supplicant \ 66 wpa-supplicant \
88 dhcp-client \ 67 dhcp-client \
89 ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \
90" 68"
91 69
92FILES_${PN}-dbg += " \ 70FILES_${PN}-dbg += " \
@@ -95,14 +73,11 @@ FILES_${PN}-dbg += " \
95" 73"
96 74
97FILES_${PN}-dev += " \ 75FILES_${PN}-dev += " \
98 ${datadir}/NetworkManager/gdb-cmd \
99 ${libdir}/pppd/*/*.la \ 76 ${libdir}/pppd/*/*.la \
100 ${libdir}/NetworkManager/*.la \ 77 ${libdir}/NetworkManager/*.la \
101" 78"
102 79
103FILES_${PN}-tests = " \ 80FILES_${PN}-tests = " \
104 ${bindir}/nm-tool \
105 ${bindir}/libnm-glib-test \
106 ${bindir}/nm-online \ 81 ${bindir}/nm-online \
107" 82"
108 83