mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

vim: Rework to not rely on relative directories

Browse Source 
The vim recipe has all of the code inside the "src" subdirectory but
other things we rely on, such as the license file in a subdirectory
relative to the src.  However, as there is a top-level "configure"
script that moves us down to the src directory, we can rework the recipe
to be overall more simple and regularly laid out if we use that.

(From OE-Core rev: 2eb66c1ff55a3fe9785967f45f1cb6a27df44f93)

Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Rini
2019-05-01 08:51:08 -04:00
committed by Richard Purdie
parent ec3c2d4650
commit 554c9904bb
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/vim/vim-tiny_8.1.1017.bb
+1 -1
View File
@@ -8,7 +8,7 @@ ALTERNATIVE_${PN}_remove = "xxd"
PACKAGECONFIG += "tiny" PACKAGECONFIG += "tiny"
do_install() { do_install() {
install -D -m 0755 ${S}/vim ${D}/${bindir}/vim.tiny install -D -m 0755 ${S}/src/vim ${D}/${bindir}/vim.tiny
} }
ALTERNATIVE_PRIORITY = "90" ALTERNATIVE_PRIORITY = "90"
meta/recipes-support/vim/vim_8.1.1017.bb
+10 -8
View File
@@ -6,16 +6,16 @@ DEPENDS = "ncurses gettext-native"
# vimdiff doesn't like busybox diff # vimdiff doesn't like busybox diff
RSUGGESTS_${PN} = "diffutils" RSUGGESTS_${PN} = "diffutils"
LICENSE = "vim" LICENSE = "vim"
LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72" LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72"
SRC_URI = "git://github.com/vim/vim.git \ SRC_URI = "git://github.com/vim/vim.git \
file://disable_acl_header_check.patch;patchdir=.. \ file://disable_acl_header_check.patch \
file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \ file://vim-add-knob-whether-elf.h-are-checked.patch \
file://0001-src-Makefile-improve-reproducibility.patch;patchdir=.. \ file://0001-src-Makefile-improve-reproducibility.patch \
" "
SRCREV = "493fbe4abee660d30b4f2aef87b754b0a720213c" SRCREV = "493fbe4abee660d30b4f2aef87b754b0a720213c"
S = "${WORKDIR}/git/src" S = "${WORKDIR}/git"
VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
@@ -25,13 +25,15 @@ CLEANBROKEN = "1"
# vim configure.in contains functions which got 'dropped' by autotools.bbclass # vim configure.in contains functions which got 'dropped' by autotools.bbclass
do_configure () { do_configure () {
cd src
rm -f auto/* rm -f auto/*
touch auto/config.mk touch auto/config.mk
aclocal aclocal
autoconf autoconf
cd ..
oe_runconf oe_runconf
touch auto/configure touch src/auto/configure
touch auto/config.mk auto/config.h touch src/auto/config.mk src/auto/config.h
} }
#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
@@ -76,7 +78,7 @@ do_install() {
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py
# Install example vimrc from runtime files # Install example vimrc from runtime files
install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc
# we use --with-features=big as default # we use --with-features=big as default
mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN} mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}