summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2011-06-16 13:27:43 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 12:55:41 (GMT)
commitdba9c14e6b7d51046cda1d1232e1d00bb2141518 (patch)
treefc00cea21f53f7757842815d6293873e3befb187 /meta/recipes-connectivity/dhcp
parent4c3691eb4ea4c84de01fb18972956b86445a3c40 (diff)
downloadpoky-dba9c14e6b7d51046cda1d1232e1d00bb2141518.tar.gz
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 <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp')
-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 159ae89..885cc19 100644
--- a/meta/recipes-connectivity/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
@@ -47,7 +47,9 @@ do_install_append () {
47 install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf 47 install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
48 48
49 install -d ${D}${base_sbindir}/ 49 install -d ${D}${base_sbindir}/
50 mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/ 50 if [ "${sbindir}" != "${base_sbindir}" ]; then
51 mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
52 fi
51 install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script 53 install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
52} 54}
53 55