CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

networkmanager: Fix package splitting and systemd service issue

Browse Source 
* Put binary "/usr/bin/nm-online" into main package
  as the systemd service "NetworkManager-wait-online.service"
  is provided by main package and it needs to run
  "/usr/bin/nm-online"
* Correct "NetworkManager-wait-online.service.in"
  to avoid dependency circle and get right service status

Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Haiqing Bai 2016-09-14 11:37:53 +08:00 committed by Martin Jansa
parent a617fdcddd
commit a3cdf02a39
2 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch Normal file
View File

@ -0,0 +1,44 @@
From 0690452b863286e524d2037427816b7850301f93 Mon Sep 17 00:00:00 2001
From: Haiqing Bai <Haiqing.Bai@windriver.com>
Date: Tue, 6 Sep 2016 09:27:38 +0800
Subject: [PATCH] networkmanager: fixed issues of
NetworkManager-wait-online.service.in.
Remove network.target in "Before" to avoid circle dependency.
Wants=network.target
Before=network.target network-online.target
Correct the "WantedBy" to network-online.target.
Upstream-status: Pending
Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
---
data/NetworkManager-wait-online.service.in | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in
index 6ad6942..1753d20 100644
--- a/data/NetworkManager-wait-online.service.in
+++ b/data/NetworkManager-wait-online.service.in
@@ -1,13 +1,14 @@
[Unit]
Description=Network Manager Wait Online
+Documentation=man:nm-online(1)
Requisite=NetworkManager.service
After=NetworkManager.service
-Wants=network.target
-Before=network.target network-online.target
+Before=network-online.target
[Service]
Type=oneshot
ExecStart=@bindir@/nm-online -s -q --timeout=30
+RemainAfterExit=yes
[Install]
-WantedBy=multi-user.target
+WantedBy=network-online.target
--
1.9.1

7
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb
View File

@ -16,6 +16,7 @@ SRC_URI = " \
file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
file://0002-add-pkg-config-for-libgcrypt.patch \
file://0006-Fix-nm-version-macro-includes.patch \
file://0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch \
"
SRC_URI[md5sum] = "ebb273456a81ccf9dfaf2461061b0e96"
SRC_URI[sha256sum] = "3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e"
@ -62,7 +63,7 @@ PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests \
PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \
${PN}-nmtui ${PN}-nmtui-doc \
${PN}-adsl \
"
@ -99,10 +100,6 @@ FILES_${PN}-dev += " \
${libdir}/NetworkManager/*.la \
"
FILES_${PN}-tests = " \
${bindir}/nm-online \
"
FILES_${PN}-nmtui = " \
${bindir}/nmtui \
${bindir}/nmtui-edit \