summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2020-09-11 09:45:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-12 14:49:00 +0100
commit6559577d70d291b9a3c4d145b34d0e86a854066a (patch)
tree6ff1ce0b5059a1ff172718de5e816145facaeffa /meta/recipes-connectivity
parentd107c45b2c73a0ee2849a9864b7395fb9cbddd29 (diff)
downloadpoky-6559577d70d291b9a3c4d145b34d0e86a854066a.tar.gz
dhcpcd: 9.1.4 -> 9.2.0
Upgrade dhcpcd from 9.1.4 to 9.2.0. And add systemd services files dhcpcd.service and dhcpcd@.service from Fedora: https://src.fedoraproject.org/rpms/dhcpcd/tree/master (From OE-Core rev: 3e729e918ca7f42446517abfcd1eced72db7a7f1) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb (renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb)19
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/dhcpcd.service10
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service15
3 files changed, 40 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb
index defd3420f0..292cb5b008 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb
@@ -11,12 +11,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2"
11 11
12UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" 12UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
13 13
14SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ 14SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
15 file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch" 15 file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
16 file://dhcpcd.service \
17 file://dhcpcd@.service \
18 "
16 19
17SRC_URI[sha256sum] = "5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820" 20SRC_URI[sha256sum] = "fcb2d19672d445bbfd38678fdee4f556ef967a3ea6bd81092d10545df2cb9666"
18 21
19inherit pkgconfig autotools-brokensep 22inherit pkgconfig autotools-brokensep systemd
23
24SYSTEMD_SERVICE_${PN} = "dhcpcd.service"
20 25
21PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 26PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
22 27
@@ -25,4 +30,10 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
25 30
26EXTRA_OECONF = "--enable-ipv4" 31EXTRA_OECONF = "--enable-ipv4"
27 32
33do_install_append () {
34 # install systemd unit files
35 install -d ${D}${systemd_unitdir}/system
36 install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_unitdir}/system
37}
38
28FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" 39FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
diff --git a/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service b/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service
new file mode 100644
index 0000000000..86b5a43c37
--- /dev/null
+++ b/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service
@@ -0,0 +1,10 @@
1[Unit]
2Description=A minimalistic network configuration daemon with DHCPv4, rdisc and DHCPv6 support
3Wants=network.target
4Before=network.target
5
6[Service]
7ExecStart=/usr/sbin/dhcpcd -q --nobackground
8
9[Install]
10WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service b/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service
new file mode 100644
index 0000000000..c81bb05ea5
--- /dev/null
+++ b/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service
@@ -0,0 +1,15 @@
1[Unit]
2Description=dhcpcd on %I
3Wants=network.target
4Before=network.target
5BindsTo=sys-subsystem-net-devices-%i.device
6After=sys-subsystem-net-devices-%i.device
7
8[Service]
9Type=forking
10PIDFile=/run/dhcpcd-%I.pid
11ExecStart=/usr/sbin/dhcpcd -q %I
12ExecStop=/usr/sbin/dhcpcd -x %I
13
14[Install]
15WantedBy=multi-user.target