From: "Jack Mitchell" <ml@embed.me.uk>
To: openembedded-core@lists.openembedded.org
Cc: Yi Zhao <yi.zhao@windriver.com>, Kai <kai.kang@windriver.com>,
Jack Mitchell <ml@embed.me.uk>
Subject: [PATCH 2/3] systemd-conf: add PACKAGECONFIG to enable/disable auto ethernet DHCP
Date: Thu, 3 Dec 2020 10:35:01 +0000 [thread overview]
Message-ID: <20201203103502.192240-2-ml@embed.me.uk> (raw)
In-Reply-To: <20201203103502.192240-1-ml@embed.me.uk>
Allow distros which include other network managers to disable the
auto DHCP setup of interfaces in systemd-networkd.
Signed-off-by: Jack Mitchell <ml@embed.me.uk>
---
meta/recipes-core/systemd/systemd-conf_246.1.bb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd-conf_246.1.bb b/meta/recipes-core/systemd/systemd-conf_246.1.bb
index d9ec023bfd..944b56ff82 100644
--- a/meta/recipes-core/systemd/systemd-conf_246.1.bb
+++ b/meta/recipes-core/systemd/systemd-conf_246.1.bb
@@ -5,6 +5,9 @@ DefaultTimeoutStartSec setting."
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PACKAGECONFIG ??= "dhcp-ethernet"
+PACKAGECONFIG[dhcp-ethernet] = ""
+
SRC_URI = "\
file://journald.conf \
file://logind.conf \
@@ -17,7 +20,10 @@ do_install() {
install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf
install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf
- install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network
+
+ if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then
+ install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network
+ fi
}
# Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52
--
2.29.2
next prev parent reply other threads:[~2020-12-03 10:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 10:35 [PATCH 1/3] Revert "connman: set service to conflict with systemd-networkd" Jack Mitchell
2020-12-03 10:35 ` Jack Mitchell [this message]
2020-12-03 10:35 ` [PATCH 3/3] systemd-conf: match ethernet interfaces by type rather than globbing Jack Mitchell
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=20201203103502.192240-2-ml@embed.me.uk \
--to=ml@embed.me.uk \
--cc=kai.kang@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=yi.zhao@windriver.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox