From dba9c14e6b7d51046cda1d1232e1d00bb2141518 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Thu, 16 Jun 2011 14:27:43 +0100 Subject: dhcp: don't try to move files from ${sbindir} to ${base_sbindir} if they are the same (From OE-Core rev: 70a786ad881607f6312fe80655c79ab81c53996a) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcp/dhcp4.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc index 159ae89354..885cc19413 100644 --- a/meta/recipes-connectivity/dhcp/dhcp4.inc +++ b/meta/recipes-connectivity/dhcp/dhcp4.inc @@ -47,7 +47,9 @@ do_install_append () { install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf install -d ${D}${base_sbindir}/ - mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/ + if [ "${sbindir}" != "${base_sbindir}" ]; then + mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/ + fi install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script } -- cgit v1.2.3-54-g00ecf