[PATCH 1/2] dhcpcd: install dhcpcd to /sbin rather than /usr/sbin

[PATCH 1/2] dhcpcd: install dhcpcd to /sbin rather than /usr/sbin

[Yi Zhao]

The dhcpcd path is hardcoded to /sbin in ifupdown package. Move dhcpcd
from /usr/sbin to /sbin to make sure ifup/ifdown can find it when dhcpcd
as the dhcp client backend.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb       | 1 +
 meta/recipes-connectivity/dhcpcd/files/dhcpcd.service  | 2 +-
 meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb
index e520115f71..c572868c7e 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb
@@ -34,6 +34,7 @@ PACKAGECONFIG[ypbind] = "--with-eghook=yp, , ,ypbind-mt"
 
 EXTRA_OECONF = "--enable-ipv4 \
                 --dbdir=${localstatedir}/lib/${BPN} \
+                --sbindir=${base_sbindir} \
                 --runstatedir=/run \
                 --enable-privsep \
                 --privsepuser=dhcpcd \
diff --git a/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service b/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service
index bbed6d85c4..6c967ddaf0 100644
--- a/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service
+++ b/meta/recipes-connectivity/dhcpcd/files/dhcpcd.service
@@ -5,7 +5,7 @@ Before=network.target
 Conflicts=connman.service
 
 [Service]
-ExecStart=/usr/sbin/dhcpcd -q --nobackground
+ExecStart=/sbin/dhcpcd -q --nobackground
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service b/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service
index 389b076c38..845b83b9e5 100644
--- a/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service
+++ b/meta/recipes-connectivity/dhcpcd/files/dhcpcd@.service
@@ -9,8 +9,8 @@ Conflicts=connman.service
 [Service]
 Type=forking
 PIDFile=/run/dhcpcd/%I.pid
-ExecStart=/usr/sbin/dhcpcd -q %I
-ExecStop=/usr/sbin/dhcpcd -x %I
+ExecStart=/sbin/dhcpcd -q %I
+ExecStop=/sbin/dhcpcd -x %I
 
 [Install]
 WantedBy=multi-user.target
-- 
2.17.1

[PATCH 2/2] dhcpcd: upgrade 9.3.1 -> 9.3.2

[Yi Zhao]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../dhcpcd/{dhcpcd_9.3.1.bb => dhcpcd_9.3.2.bb}                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-connectivity/dhcpcd/{dhcpcd_9.3.1.bb => dhcpcd_9.3.2.bb} (95%)

diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb
similarity index 95%
rename from meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb
rename to meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb
index c572868c7e..cca60ddae2 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.1.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb
@@ -17,7 +17,7 @@ SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
            file://dhcpcd@.service \
            "
 
-SRC_URI[sha256sum] = "a0843233fdaecee971c38ceda53ad1450bb7b83aefbf1fa9642213224a9c415e"
+SRC_URI[sha256sum] = "6d49af5e766a2515e6366e4f669663df04ecdf90a1a60ddb1d7a2feb4b5d2566"
 
 inherit pkgconfig autotools-brokensep systemd useradd
 
-- 
2.17.1