[OE-core] [PATCH] dhcp: don't try to move files from ${sbindir} to ${base_sbindir} if they are the same

Phil Blundell pb at pbcl.net
Thu Jun 16 13:27:43 UTC 2011


Signed-off-by: Phil Blundell <philb at gnu.org>
---
 meta/recipes-connectivity/dhcp/dhcp4.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index 159ae89..885cc19 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
 }
 
-- 
1.7.2.5







More information about the Openembedded-core mailing list