From f91604daee1b79aa41307a28bf38dd0a2e2c82a4 Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Tue, 1 Feb 2022 16:11:36 +0100 Subject: dhcpcd: add option to set DBDIR location This will allow to use the different DBDIR location, because the /var/lib could be used as a read-only location. (From OE-Core rev: 8fe5cff505f4fd942723d6f1526b0461747fc44d) Signed-off-by: Andrej Valek Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 4007a4bd2d..ab6ffe986c 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -32,8 +32,11 @@ PACKAGECONFIG[ntp] = "--with-hook=ntp, , ,ntp" PACKAGECONFIG[chrony] = "--with-hook=ntp, , ,chrony" PACKAGECONFIG[ypbind] = "--with-eghook=yp, , ,ypbind-mt" +# add option to override DBDIR location +DBDIR ?= "${localstatedir}/lib/${BPN}" + EXTRA_OECONF = "--enable-ipv4 \ - --dbdir=${localstatedir}/lib/${BPN} \ + --dbdir=${DBDIR} \ --sbindir=${base_sbindir} \ --runstatedir=/run \ --enable-privsep \ @@ -43,15 +46,15 @@ EXTRA_OECONF = "--enable-ipv4 \ " USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system -d ${localstatedir}/lib/${BPN} -M -s /bin/false -U dhcpcd" +USERADD_PARAM:${PN} = "--system -d ${DBDIR} -M -s /bin/false -U dhcpcd" do_install:append () { # install systemd unit files install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir} - chmod 700 ${D}${localstatedir}/lib/${BPN} - chown dhcpcd:dhcpcd ${D}${localstatedir}/lib/${BPN} + chmod 700 ${D}${DBDIR} + chown dhcpcd:dhcpcd ${D}${DBDIR} } FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" -- cgit v1.2.3-54-g00ecf