diff options
author | Adrian <adrian.freihofer@gmail.com> | 2015-11-11 20:48:09 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-18 12:28:22 +0100 |
commit | a37cb2ad94317e8302a23be15fd49890e06369ad (patch) | |
tree | b1651e3fe88dd854f3604055c74d514eea59e778 /meta-oe/recipes-connectivity/networkmanager | |
parent | 307358bada36f784b2e846385e51fc8d5ca314bc (diff) | |
download | meta-openembedded-a37cb2ad94317e8302a23be15fd49890e06369ad.tar.gz |
networkmanager: Update to 1.0.6
Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity/networkmanager')
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb (renamed from meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb) | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb index 310a83bc6..afe5eb82a 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | |||
@@ -2,18 +2,21 @@ SUMMARY = "NetworkManager" | |||
2 | SECTION = "net/misc" | 2 | SECTION = "net/misc" |
3 | 3 | ||
4 | LICENSE = "GPLv2+" | 4 | LICENSE = "GPLv2+" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ |
6 | file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ | ||
7 | file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b \ | ||
8 | " | ||
6 | 9 | ||
7 | DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools nss util-linux libndp" | 10 | DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools nss util-linux libndp" |
8 | 11 | ||
9 | inherit gnome gettext systemd | 12 | inherit gnomebase gettext systemd |
10 | 13 | ||
11 | SRC_URI = " \ | 14 | SRC_URI = " \ |
12 | ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ | 15 | ${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 \ | 16 | file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ |
14 | " | 17 | " |
15 | SRC_URI[md5sum] = "7eabef7bd3bbdd6dc0473dd32aeac924" | 18 | SRC_URI[md5sum] = "00f5f9ec69725a9f9b99366853c6f73e" |
16 | SRC_URI[sha256sum] = "e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9" | 19 | SRC_URI[sha256sum] = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd" |
17 | 20 | ||
18 | S = "${WORKDIR}/NetworkManager-${PV}" | 21 | S = "${WORKDIR}/NetworkManager-${PV}" |
19 | 22 | ||
@@ -31,14 +34,14 @@ EXTRA_OECONF = " \ | |||
31 | --with-dnsmasq=${bindir}/dnsmasq \ | 34 | --with-dnsmasq=${bindir}/dnsmasq \ |
32 | " | 35 | " |
33 | 36 | ||
34 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" | 37 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" |
35 | PACKAGECONFIG[systemd] = " \ | 38 | PACKAGECONFIG[systemd] = " \ |
36 | --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ | 39 | --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ |
37 | --without-systemdsystemunitdir, \ | 40 | --without-systemdsystemunitdir, \ |
38 | polkit \ | 41 | polkit \ |
39 | " | 42 | " |
40 | # consolekit is not picked by shlibs, so add it to RDEPENDS too | ||
41 | PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" | 43 | PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" |
44 | # consolekit is not picked by shlibs, so add it to RDEPENDS too | ||
42 | PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" | 45 | PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" |
43 | PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4" | 46 | PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4" |
44 | PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" | 47 | PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" |
@@ -73,6 +76,7 @@ FILES_${PN}-dbg += " \ | |||
73 | " | 76 | " |
74 | 77 | ||
75 | FILES_${PN}-dev += " \ | 78 | FILES_${PN}-dev += " \ |
79 | ${datadir}/NetworkManager/gdb-cmd \ | ||
76 | ${libdir}/pppd/*/*.la \ | 80 | ${libdir}/pppd/*/*.la \ |
77 | ${libdir}/NetworkManager/*.la \ | 81 | ${libdir}/NetworkManager/*.la \ |
78 | " | 82 | " |