summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaiqing Bai <Haiqing.Bai@windriver.com>2016-09-14 11:37:53 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2016-09-19 16:24:03 +0200
commita3cdf02a3980746d9a29fd5d0e485e0ec4b8a8a3 (patch)
tree7895205430ec67cd0c39a9d70a840730761ea399
parenta617fdcdddec44fd6a99cdb6f6163f5483a494bf (diff)
downloadmeta-openembedded-a3cdf02a3980746d9a29fd5d0e485e0ec4b8a8a3.tar.gz
networkmanager: Fix package splitting and systemd service issue
* 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>
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch44
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb7
2 files changed, 46 insertions, 5 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch
new file mode 100644
index 000000000..4eb9e2168
--- /dev/null
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch
@@ -0,0 +1,44 @@
1From 0690452b863286e524d2037427816b7850301f93 Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Tue, 6 Sep 2016 09:27:38 +0800
4Subject: [PATCH] networkmanager: fixed issues of
5 NetworkManager-wait-online.service.in.
6
7Remove network.target in "Before" to avoid circle dependency.
8Wants=network.target
9Before=network.target network-online.target
10
11Correct the "WantedBy" to network-online.target.
12
13Upstream-status: Pending
14
15Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
16---
17 data/NetworkManager-wait-online.service.in | 7 ++++---
18 1 file changed, 4 insertions(+), 3 deletions(-)
19
20diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in
21index 6ad6942..1753d20 100644
22--- a/data/NetworkManager-wait-online.service.in
23+++ b/data/NetworkManager-wait-online.service.in
24@@ -1,13 +1,14 @@
25 [Unit]
26 Description=Network Manager Wait Online
27+Documentation=man:nm-online(1)
28 Requisite=NetworkManager.service
29 After=NetworkManager.service
30-Wants=network.target
31-Before=network.target network-online.target
32+Before=network-online.target
33
34 [Service]
35 Type=oneshot
36 ExecStart=@bindir@/nm-online -s -q --timeout=30
37+RemainAfterExit=yes
38
39 [Install]
40-WantedBy=multi-user.target
41+WantedBy=network-online.target
42--
431.9.1
44
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb
index 56ca84768..913488085 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb
@@ -16,6 +16,7 @@ SRC_URI = " \
16 file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ 16 file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
17 file://0002-add-pkg-config-for-libgcrypt.patch \ 17 file://0002-add-pkg-config-for-libgcrypt.patch \
18 file://0006-Fix-nm-version-macro-includes.patch \ 18 file://0006-Fix-nm-version-macro-includes.patch \
19 file://0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch \
19" 20"
20SRC_URI[md5sum] = "ebb273456a81ccf9dfaf2461061b0e96" 21SRC_URI[md5sum] = "ebb273456a81ccf9dfaf2461061b0e96"
21SRC_URI[sha256sum] = "3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e" 22SRC_URI[sha256sum] = "3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e"
@@ -62,7 +63,7 @@ PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
62PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" 63PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
63PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" 64PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
64 65
65PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests \ 66PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \
66 ${PN}-nmtui ${PN}-nmtui-doc \ 67 ${PN}-nmtui ${PN}-nmtui-doc \
67 ${PN}-adsl \ 68 ${PN}-adsl \
68" 69"
@@ -99,10 +100,6 @@ FILES_${PN}-dev += " \
99 ${libdir}/NetworkManager/*.la \ 100 ${libdir}/NetworkManager/*.la \
100" 101"
101 102
102FILES_${PN}-tests = " \
103 ${bindir}/nm-online \
104"
105
106FILES_${PN}-nmtui = " \ 103FILES_${PN}-nmtui = " \
107 ${bindir}/nmtui \ 104 ${bindir}/nmtui \
108 ${bindir}/nmtui-edit \ 105 ${bindir}/nmtui-edit \