[oe-commits] Martin Jansa : vim: fix up for /bin/vi

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 8ca955d2276af1025ace337a397966e4fbd49ce0
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=8ca955d2276af1025ace337a397966e4fbd49ce0

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Feb 19 16:23:41 2015 +0100

vim: fix up for /bin/vi

* it was changed in:
  Commit: 95dc2ddce7a0ee4d16d6c69fd123e4e6921bdf2e
  URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=95dc2ddce7a0ee4d16d6c69fd123e4e6921bdf2e
  Author: Jackie Huang <jackie.huang at windriver.com>
  Date:   Thu Nov  6 03:22:27 2014 -0500
  Subject: vim: add recipe for vim-tiny

  but busybox still registers /bin/vi, so u-a was broken
  update-alternatives: Error: cannot register alternative vi to
  /usr/bin/vi since it is already registered to /bin/vi

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/vim/vim_7.4.481.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/vim/vim_7.4.481.bb b/meta-oe/recipes-support/vim/vim_7.4.481.bb
index 7490229..afdea84 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.481.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.481.bb
@@ -104,6 +104,6 @@ RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-commo
 
 ALTERNATIVE_${PN} = "vi vim"
 ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
-ALTERNATIVE_LINK_NAME[vi] = "${bindir}/vi"
+ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
 ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
 ALTERNATIVE_PRIORITY = "100"