From: <mingli.yu@windriver.com>
To: <openembedded-devel@lists.openembedded.org>, <Haiqing.Bai@windriver.com>
Subject: [meta-oe][PATCH] networkmanager: Fix package splitting and systemd service issue
Date: Wed, 14 Sep 2016 11:37:53 +0800 [thread overview]
Message-ID: <1473824273-29398-1-git-send-email-mingli.yu@windriver.com> (raw)
From: Haiqing Bai <Haiqing.Bai@windriver.com>
* 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>
---
...ger-fixed-issues-of-NetworkManager-wait-o.patch | 44 ++++++++++++++++++++++
.../networkmanager/networkmanager_1.0.12.bb | 7 +---
2 files changed, 46 insertions(+), 5 deletions(-)
create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch
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 0000000..4eb9e21
--- /dev/null
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch
@@ -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
+
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 56ca847..9134880 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 = " \
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 \
--
2.8.1
reply other threads:[~2016-09-14 3:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473824273-29398-1-git-send-email-mingli.yu@windriver.com \
--to=mingli.yu@windriver.com \
--cc=Haiqing.Bai@windriver.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.