From: Phil Blundell <pb@pbcl.net>
Date: Thu, 16 Jun 2011 13:27:43 +0000 (+0100)
Subject: dhcp: don't try to move files from ${sbindir} to ${base_sbindir} if they are the... 
X-Git-Tag: 2011-1~1000
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=70a786ad881607f6312fe80655c79ab81c53996a;p=openembedded-core.git

dhcp: don't try to move files from ${sbindir} to ${base_sbindir} if they are the same

Signed-off-by: Phil Blundell <philb@gnu.org>
---

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
 }