helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-01 21:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

networkmanager: move systemd support to meta-systemd

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller 2012-06-10 21:47:00 +00:00 committed by Koen Kooi
parent 87526c2f21
commit c21e67f8e5
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
View File

@ -4,10 +4,10 @@ SECTION = "net/misc"
LICENSE = "GPLv2+" LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" 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" DEPENDS = "libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp"
inherit gnome gettext systemd inherit gnome gettext
SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.bz2 \ 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 \ 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}" S = "${WORKDIR}/NetworkManager-${PV}"
SYSTEMD_UNITDIR ??= "no"
EXTRA_OECONF = " \ EXTRA_OECONF = " \
--with-distro=debian \ --with-distro=debian \
--with-crypto=gnutls \ --with-crypto=gnutls \
@ -26,6 +28,7 @@ EXTRA_OECONF = " \
--with-dhclient=${base_sbindir}/dhclient \ --with-dhclient=${base_sbindir}/dhclient \
--with-iptables=${sbindir}/iptables \ --with-iptables=${sbindir}/iptables \
--with-tests \ --with-tests \
--with-systemdsystemunitdir=${SYSTEMD_UNITDIR} \
" "
do_configure_prepend() { do_configure_prepend() {
@ -54,9 +57,6 @@ do_install_append () {
install -d ${D}/etc/NetworkManager/VPN install -d ${D}/etc/NetworkManager/VPN
} }
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE = "NetworkManager.service"
PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests" PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests"
FILES_libnmutil += "${libdir}/libnm-util.so.*" FILES_libnmutil += "${libdir}/libnm-util.so.*"
@ -70,7 +70,6 @@ FILES_${PN} += " \
${datadir}/polkit-1 \ ${datadir}/polkit-1 \
${datadir}/dbus-1 \ ${datadir}/dbus-1 \
${base_libdir}/udev/* \ ${base_libdir}/udev/* \
${systemd_unitdir}/system/NetworkManager-wait-online.service \
" "
RRECOMMENDS_${PN} += "iptables" RRECOMMENDS_${PN} += "iptables"

14
meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend Normal file
View File

@ -0,0 +1,14 @@
PRINC := "${@int(PRINC) + 1}"
inherit systemd
DEPENDS += "systemd"
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE = "NetworkManager.service"
SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
# NetworkManager-wait-online is not catched by systemd.bbclass
FILES_${PN} += " \
${systemd_unitdir}/system/NetworkManager-wait-online.service \
"