From: Yi Zhao <yi.zhao@windriver.com>
Date: Thu, 15 Oct 2020 06:29:29 +0000 (+0800)
Subject: dhcpcd: add PACKAGECONFIG for ntp/chrony/ypbind hooks
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~9909
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5039d313df6cb2c477766ada936806e4ffd5a8ec;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

dhcpcd: add PACKAGECONFIG for ntp/chrony/ypbind hooks

By default, the dhcpcd will search ntp/chrony/ypbind in host path when
configuring and install the hooks once it find them. Add PACKAGECONFIG
for these hooks to avoid the host contamination.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb
index 4344841b546..13467189b42 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb
@@ -27,10 +27,18 @@ PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 
 PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
+# ntp conflicts with chrony
+PACKAGECONFIG[ntp] = "--with-hook=ntp, , ,ntp"
+PACKAGECONFIG[chrony] = "--with-hook=ntp, , ,chrony"
+PACKAGECONFIG[ypbind] = "--with-eghook=yp, , ,ypbind-mt"
 
 EXTRA_OECONF = "--enable-ipv4 \
                 --dbdir=${localstatedir}/lib/${BPN} \
                 --runstatedir=/run \
+                --enable-privsep \
+                --privsepuser=dhcpcd \
+                --with-hooks \
+                --with-eghooks \
                "
 
 USERADD_PACKAGES = "${PN}"