Skip to contentSkip to conversation

vim: fix do_install for those using FILESPATH* overrides

PATCH In review Tim Harvey 2 participants 2 messages Nov 12, 2010

lore
Share & tools
lore

Tim Harvey

author
#0 lore raw

PATCH 1/1 vim: fix do_install for those using FILESPATH* overrides

WORKDIR should be used for the source directory of vimrc. This fixes breakage for those using FILESPATHBASE/FILESPATHPKG/FILESPATH overrides

---
 recipes/vim/vim_7.2.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/vim/vim_7.2.bb +2 -2
index b887ce4..99a8e31 100644
@@ -11,7 +11,7 @@ VIMX ?= "--without-x"
 
 require vim.inc
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 # 001-411.diff contains 411 patches fetched from upstream
 SRC_URI += "file://001-411.diff;apply=no"
@@ -28,7 +28,7 @@ do_applypatch() {
 addtask applypatch after do_unpack before do_patch
 
 do_install_append() {
-    install -m 0644 ${FILESDIR}/vimrc ${D}/${datadir}/vim
+    install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/vim
 }
 
 RCONFLICTS_${PN} = "gvim vim-tiny"
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 3 lines · Tim Harvey

WORKDIR should be used for the source directory of vimrc.  This fixes breakage for those using FILESPATHBASE/FILESPATHPKG/FILESPATH overrides

indeed. Thanks for patch I will take care of it.

Quoted 36 lines

---
 recipes/vim/vim_7.2.bb |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/vim/vim_7.2.bb +0 -0
index b887ce4..99a8e31 100644
@@ -11,7 +11,7 @@ VIMX ?= "--without-x"
 

 require vim.inc

recipes/vim/vim_7.2.bb +1 -1
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"

 # 001-411.diff contains 411 patches fetched from upstream SRC_URI += "file://001-411.diff;apply=no"

recipes/vim/vim_7.2.bb +0 -0
@@ -28,7 +28,7 @@ do_applypatch() {

 addtask applypatch after do_unpack before do_patch

 do_install_append() {
-    install -m 0644 ${FILESDIR}/vimrc ${D}/${datadir}/vim
+    install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/vim }

 RCONFLICTS_${PN} = "gvim vim-tiny"
--
1.7.0.4

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel