summaryrefslogtreecommitdiff
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2011-06-16 14:27:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 13:49:56 +0100
commit70a786ad881607f6312fe80655c79ab81c53996a (patch)
treeec91145c96da6d85a6384d6e1baba705acacba13 /meta/recipes-connectivity
parent42a521b28817cc8d905a93a82e02481a8968cd26 (diff)
downloadopenembedded-core-70a786ad881607f6312fe80655c79ab81c53996a.tar.gz
openembedded-core-70a786ad881607f6312fe80655c79ab81c53996a.tar.bz2
openembedded-core-70a786ad881607f6312fe80655c79ab81c53996a.zip
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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp4.inc4
1 files changed, 3 insertions, 1 deletions
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
}