From a2fcedbe20664d5be5e8c00ece3e2f95e8f2b1a3 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 6 Aug 2015 22:00:01 +0200 Subject: networkmanager: update to 1.0.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- .../networkmanager/networkmanager_1.0.2.bb | 86 ---------------------- .../networkmanager/networkmanager_1.0.4.bb | 86 ++++++++++++++++++++++ 2 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb (limited to 'meta-oe/recipes-connectivity/networkmanager') diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb deleted file mode 100644 index 324d1658e4..0000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb +++ /dev/null @@ -1,86 +0,0 @@ -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 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 \ -" -SRC_URI[md5sum] = "5a4899f89edcbdd1ac46d2d947e8d6eb" -SRC_URI[sha256sum] = "359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff" - -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 \ - --with-dnsmasq=${bindir}/dnsmasq \ -" - -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[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -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" - -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 \ -" - -RRECOMMENDS_${PN} += "iptables dnsmasq" -RCONFLICTS_${PN} = "connman" -RDEPENDS_${PN} = " \ - wpa-supplicant \ - dhcp-client \ -" - -FILES_${PN}-dbg += " \ - ${libdir}/NetworkManager/.debug/ \ - ${libdir}/pppd/*/.debug/ \ -" - -FILES_${PN}-dev += " \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ -" - -FILES_${PN}-tests = " \ - ${bindir}/nm-online \ -" - -FILES_${PN}-bash-completion = "${datadir}/bash-completion" - -SYSTEMD_SERVICE_${PN} = "NetworkManager.service" diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb new file mode 100644 index 0000000000..62debe952f --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb @@ -0,0 +1,86 @@ +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 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 \ +" +SRC_URI[md5sum] = "7eabef7bd3bbdd6dc0473dd32aeac924" +SRC_URI[sha256sum] = "e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9" + +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 \ + --with-dnsmasq=${bindir}/dnsmasq \ +" + +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[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" +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" + +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 \ +" + +RRECOMMENDS_${PN} += "iptables dnsmasq" +RCONFLICTS_${PN} = "connman" +RDEPENDS_${PN} = " \ + wpa-supplicant \ + dhcp-client \ +" + +FILES_${PN}-dbg += " \ + ${libdir}/NetworkManager/.debug/ \ + ${libdir}/pppd/*/.debug/ \ +" + +FILES_${PN}-dev += " \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ +" + +FILES_${PN}-tests = " \ + ${bindir}/nm-online \ +" + +FILES_${PN}-bash-completion = "${datadir}/bash-completion" + +SYSTEMD_SERVICE_${PN} = "NetworkManager.service" -- cgit 1.2.3-korg