diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-10 21:47:00 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:08 +0200 |
| commit | c21e67f8e5ac13d35dd6e4312f19220453c06f0a (patch) | |
| tree | 6eb3f2b2b1963b5d74496409225e07502c9a4e00 /meta-oe/recipes-connectivity | |
| parent | 87526c2f21b9ae911d74616e0f74b7eef43fa13a (diff) | |
| download | meta-openembedded-c21e67f8e5ac13d35dd6e4312f19220453c06f0a.tar.gz | |
networkmanager: move systemd support to meta-systemd
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_0.9.2.0.bb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb index 221dc2c7aa..e774cb9538 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb @@ -4,10 +4,10 @@ SECTION = "net/misc" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" -PR = "r6" +PR = "r7" -DEPENDS = "systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp" -inherit gnome gettext systemd +DEPENDS = "libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp" +inherit gnome gettext SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.bz2 \ file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ @@ -19,6 +19,8 @@ SRC_URI[sha256sum] = "a178ed2f0b5a1045ec47b217ea531d0feba9208f6bcfe64b701174a5c1 S = "${WORKDIR}/NetworkManager-${PV}" +SYSTEMD_UNITDIR ??= "no" + EXTRA_OECONF = " \ --with-distro=debian \ --with-crypto=gnutls \ @@ -26,6 +28,7 @@ EXTRA_OECONF = " \ --with-dhclient=${base_sbindir}/dhclient \ --with-iptables=${sbindir}/iptables \ --with-tests \ + --with-systemdsystemunitdir=${SYSTEMD_UNITDIR} \ " do_configure_prepend() { @@ -54,9 +57,6 @@ do_install_append () { install -d ${D}/etc/NetworkManager/VPN } -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE = "NetworkManager.service" - PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests" FILES_libnmutil += "${libdir}/libnm-util.so.*" @@ -70,7 +70,6 @@ FILES_${PN} += " \ ${datadir}/polkit-1 \ ${datadir}/dbus-1 \ ${base_libdir}/udev/* \ - ${systemd_unitdir}/system/NetworkManager-wait-online.service \ " RRECOMMENDS_${PN} += "iptables" |