This include file contains source-related settings that should be common for any recipes whose sources belong into Vim's source code.
The first example is xxd, which will be introduced in a follow-up commit. Signed-off-by: João Marcos Costa <[email protected]> --- meta/recipes-support/vim/vim-sources.inc | 9 +++++++++ meta/recipes-support/vim/vim.inc | 14 +------------- meta/recipes-support/vim/vim_9.2.bb | 5 +++++ 3 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 meta/recipes-support/vim/vim-sources.inc diff --git a/meta/recipes-support/vim/vim-sources.inc b/meta/recipes-support/vim/vim-sources.inc new file mode 100644 index 0000000000..19d3b2d15b --- /dev/null +++ b/meta/recipes-support/vim/vim-sources.inc @@ -0,0 +1,9 @@ +SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https;tag=v${PV}" + +PV .= ".0340" +SRCREV = "6addd6c101117706bc9b3609d3a418e26e92618f" + +# Do not consider .z in x.y.z, as that is updated with every commit +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" +# Ignore that the upstream version .z in x.y.z is always newer +UPSTREAM_VERSION_UNKNOWN = "1" diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 6e0058b13e..190953b9dd 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -12,19 +12,7 @@ RSUGGESTS:${PN} = "diffutils" LICENSE = "Vim" LIC_FILES_CHKSUM = "file://LICENSE;md5=d1a651ab770b45d41c0f8cb5a8ca930e" -SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https;tag=v${PV} \ - file://disable_acl_header_check.patch \ - file://0001-src-Makefile-improve-reproducibility.patch \ - file://no-path-adjust.patch \ - " - -PV .= ".0340" -SRCREV = "6addd6c101117706bc9b3609d3a418e26e92618f" - -# Do not consider .z in x.y.z, as that is updated with every commit -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" -# Ignore that the upstream version .z in x.y.z is always newer -UPSTREAM_VERSION_UNKNOWN = "1" +require vim-sources.inc VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" diff --git a/meta/recipes-support/vim/vim_9.2.bb b/meta/recipes-support/vim/vim_9.2.bb index fee9f055e9..59de224aac 100644 --- a/meta/recipes-support/vim/vim_9.2.bb +++ b/meta/recipes-support/vim/vim_9.2.bb @@ -1,5 +1,10 @@ require vim.inc +SRC_URI += "file://disable_acl_header_check.patch \ + file://0001-src-Makefile-improve-reproducibility.patch \ + file://no-path-adjust.patch \ +" + PROVIDES = "xxd" RDEPENDS:${PN} = "ncurses-terminfo-base ${PN}-xxd" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#237508): https://lists.openembedded.org/g/openembedded-core/message/237508 Mute This Topic: https://lists.openembedded.org/mt/119424105/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
