From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 17 Jul 2013 09:06:57 +0000 (+0800)
Subject: iproute2: Fix alternative link for ip command
X-Git-Tag: 2015-4~5813
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b45f322abfa72fb0330aac9a1e4c86aebcc4598e;p=openembedded-core.git

iproute2: Fix alternative link for ip command

In busybox the default location of symbolic link for command ip is
/sbin/ip. But in iproute2, the alternatvie link for ip is /bin/ip.
It will cause an error when running update-alternatives:
Cannot register alternative ip to /bin/ip since it is already registered
to /sbin/ip.

[YOCTO #4855]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index fb233ebd43..3db21db8d9 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -31,7 +31,7 @@ FILES_${PN}-dbg += "${libdir}/tc/.debug"
 
 ALTERNATIVE_${PN} = "ip"
 ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"
-ALTERNATIVE_LINK_NAME[ip] = "${base_bindir}/ip"
+ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip"
 ALTERNATIVE_PRIORITY = "100"
 
 PARALLEL_MAKE = ""