summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2013-07-17 17:06:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-18 21:23:46 +0100
commit37784b9822c95e9c713dd5813d9ac3e65087b6e4 (patch)
tree08c50376aad95ac88a6ec3d3a4e9184acdfe9af3
parent26207e241ddc469b951ffea26dfc0661817d124d (diff)
downloadpoky-37784b9822c95e9c713dd5813d9ac3e65087b6e4.tar.gz
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] (From OE-Core rev: b45f322abfa72fb0330aac9a1e4c86aebcc4598e) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2.inc2
1 files changed, 1 insertions, 1 deletions
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"
31 31
32ALTERNATIVE_${PN} = "ip" 32ALTERNATIVE_${PN} = "ip"
33ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" 33ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"
34ALTERNATIVE_LINK_NAME[ip] = "${base_bindir}/ip" 34ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip"
35ALTERNATIVE_PRIORITY = "100" 35ALTERNATIVE_PRIORITY = "100"
36 36
37PARALLEL_MAKE = "" 37PARALLEL_MAKE = ""