From: Tom Rini <trini@konsulko.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 1/2] vim: Rework to not rely on relative directories
Date: Sun, 21 Apr 2019 13:57:04 -0400 [thread overview]
Message-ID: <1555869425-7613-1-git-send-email-trini@konsulko.com> (raw)
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.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
meta/recipes-support/vim/vim-tiny_8.1.1017.bb | 2 +-
meta/recipes-support/vim/vim_8.1.1017.bb | 18 ++++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-support/vim/vim-tiny_8.1.1017.bb b/meta/recipes-support/vim/vim-tiny_8.1.1017.bb
index 8b1fb7b1158d..74464833adb5 100644
--- a/meta/recipes-support/vim/vim-tiny_8.1.1017.bb
+++ b/meta/recipes-support/vim/vim-tiny_8.1.1017.bb
@@ -8,7 +8,7 @@ ALTERNATIVE_${PN}_remove = "xxd"
PACKAGECONFIG += "tiny"
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"
diff --git a/meta/recipes-support/vim/vim_8.1.1017.bb b/meta/recipes-support/vim/vim_8.1.1017.bb
index 7627d2844b79..4e3e663c5429 100644
--- a/meta/recipes-support/vim/vim_8.1.1017.bb
+++ b/meta/recipes-support/vim/vim_8.1.1017.bb
@@ -6,16 +6,16 @@ DEPENDS = "ncurses gettext-native"
# vimdiff doesn't like busybox diff
RSUGGESTS_${PN} = "diffutils"
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 \
- file://disable_acl_header_check.patch;patchdir=.. \
- file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \
- file://0001-src-Makefile-improve-reproducibility.patch;patchdir=.. \
+ file://disable_acl_header_check.patch \
+ file://vim-add-knob-whether-elf.h-are-checked.patch \
+ file://0001-src-Makefile-improve-reproducibility.patch \
"
SRCREV = "493fbe4abee660d30b4f2aef87b754b0a720213c"
-S = "${WORKDIR}/git/src"
+S = "${WORKDIR}/git"
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
do_configure () {
+ cd src
rm -f auto/*
touch auto/config.mk
aclocal
autoconf
+ cd ..
oe_runconf
- touch auto/configure
- touch auto/config.mk auto/config.h
+ touch src/auto/configure
+ touch src/auto/config.mk src/auto/config.h
}
#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
@@ -76,7 +78,7 @@ do_install() {
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py
# 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
mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}
--
2.7.4
next reply other threads:[~2019-04-21 17:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-21 17:57 Tom Rini [this message]
2019-04-21 17:57 ` [PATCH 2/2] vim: Update to 8.1.1198 Tom Rini
2019-04-23 15:02 ` Richard Purdie
2019-04-23 22:01 ` Tom Rini
2019-04-23 22:22 ` richard.purdie
2019-04-23 22:29 ` Tom Rini
2019-04-24 1:17 ` Tom Rini
2019-04-24 5:24 ` Tim Orling
2019-04-24 12:01 ` Tom Rini
2019-04-24 7:40 ` richard.purdie
2019-04-24 11:29 ` Tom Rini
2019-04-24 13:50 ` richard.purdie
2019-04-24 13:53 ` Tom Rini
2019-04-24 21:08 ` [RFC DO NOT APPLY][PATCH 3/2] vim: Add a work-around for some locale issues Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1555869425-7613-1-git-send-email-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox