diff --git a/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch b/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch new file mode 100644 index 0000000..5c9ed92 --- /dev/null +++ b/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch @@ -0,0 +1,36 @@ +From 7dd40db6606c3b3559365a03944cb99aee5ceabc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 4 Apr 2013 12:57:58 +0200 +Subject: [PATCH] don't try to run /sbin/dhclient to get the version number, + this break cross-compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [build system specific] + +Signed-off-by: Andreas Müller +--- + configure.ac | 6 ------ + 1 files changed, 0 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cc66e9b..7163287 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -488,12 +488,6 @@ AS_IF([test -z "$with_dhcpcd"], with_dhcpcd=yes) + # Search and check the executables + if test "$with_dhclient" = "yes"; then + AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin) +- if test "$with_dhclient" != "no"; then +- if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then +- AC_MSG_WARN([Cannot use dhclient, version 4.x is required]) +- with_dhclient=no +- fi +- fi + fi + if test "$with_dhcpcd" = "yes"; then + AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin) +-- +1.7.6.5 + diff --git a/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/recipes-connectivity/networkmanager/networkmanager_%.bbappend deleted file mode 100644 index c10fd94..0000000 --- a/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG_append = " modemmanager bluez5" diff --git a/recipes-connectivity/networkmanager/networkmanager_1.4.0.bb b/recipes-connectivity/networkmanager/networkmanager_1.4.0.bb new file mode 100644 index 0000000..7cdb886 --- /dev/null +++ b/recipes-connectivity/networkmanager/networkmanager_1.4.0.bb @@ -0,0 +1,90 @@ +SUMMARY = "NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" + +DEPENDS = "libnl dbus dbus-glib libgudev 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] = "337e676261ca94af08f8e9b6f9b09a5b" +SRC_URI[sha256sum] = "c4d5e075998a291074501602a5068a7e54d9e0f2658aba079d58145d65be531d" + +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)} modemmanager bluez5" +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" + +do_install_append() { + rm -rf ${D}/run ${D}${localstatedir}/run +}