diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-support/vim | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/vim')
-rw-r--r-- | meta/recipes-support/vim/vim.inc | 24 | ||||
-rw-r--r-- | meta/recipes-support/vim/vim_8.2.bb | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 878d0f18ae..9e4117466e 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc | |||
@@ -7,7 +7,7 @@ BUGTRACKER = "https://github.com/vim/vim/issues" | |||
7 | 7 | ||
8 | DEPENDS = "ncurses gettext-native" | 8 | DEPENDS = "ncurses gettext-native" |
9 | # vimdiff doesn't like busybox diff | 9 | # vimdiff doesn't like busybox diff |
10 | RSUGGESTS_${PN} = "diffutils" | 10 | RSUGGESTS:${PN} = "diffutils" |
11 | LICENSE = "vim" | 11 | LICENSE = "vim" |
12 | LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a" | 12 | LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a" |
13 | 13 | ||
@@ -113,18 +113,18 @@ do_install() { | |||
113 | PARALLEL_MAKEINST = "" | 113 | PARALLEL_MAKEINST = "" |
114 | 114 | ||
115 | PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools" | 115 | PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools" |
116 | FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax" | 116 | FILES:${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax" |
117 | FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc" | 117 | FILES:${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc" |
118 | FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor" | 118 | FILES:${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor" |
119 | FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc" | 119 | FILES:${PN}-vimrc = "${datadir}/${BPN}/vimrc" |
120 | FILES_${PN}-data = "${datadir}/${BPN}" | 120 | FILES:${PN}-data = "${datadir}/${BPN}" |
121 | 121 | ||
122 | # We do not want to complain if perl or gawk are not on the target. | 122 | # We do not want to complain if perl or gawk are not on the target. |
123 | # | 123 | # |
124 | FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools" | 124 | FILES:${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools" |
125 | INSANE_SKIP_${PN}-tools = "file-rdeps" | 125 | INSANE_SKIP:${PN}-tools = "file-rdeps" |
126 | 126 | ||
127 | FILES_${PN}-common = " \ | 127 | FILES:${PN}-common = " \ |
128 | ${datadir}/${BPN}/${VIMDIR}/*.vim \ | 128 | ${datadir}/${BPN}/${VIMDIR}/*.vim \ |
129 | ${datadir}/${BPN}/${VIMDIR}/autoload \ | 129 | ${datadir}/${BPN}/${VIMDIR}/autoload \ |
130 | ${datadir}/${BPN}/${VIMDIR}/colors \ | 130 | ${datadir}/${BPN}/${VIMDIR}/colors \ |
@@ -140,11 +140,11 @@ FILES_${PN}-common = " \ | |||
140 | ${datadir}/icons \ | 140 | ${datadir}/icons \ |
141 | " | 141 | " |
142 | 142 | ||
143 | RDEPENDS_${BPN} = "ncurses-terminfo-base" | 143 | RDEPENDS:${BPN} = "ncurses-terminfo-base" |
144 | # Recommend that runtime data is installed along with vim | 144 | # Recommend that runtime data is installed along with vim |
145 | RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common" | 145 | RRECOMMENDS:${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common" |
146 | 146 | ||
147 | ALTERNATIVE_${PN} = "vi vim" | 147 | ALTERNATIVE:${PN} = "vi vim" |
148 | ALTERNATIVE_PRIORITY = "100" | 148 | ALTERNATIVE_PRIORITY = "100" |
149 | ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}" | 149 | ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}" |
150 | ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi" | 150 | ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi" |
diff --git a/meta/recipes-support/vim/vim_8.2.bb b/meta/recipes-support/vim/vim_8.2.bb index 7e4654e472..3c1b98dca0 100644 --- a/meta/recipes-support/vim/vim_8.2.bb +++ b/meta/recipes-support/vim/vim_8.2.bb | |||
@@ -2,10 +2,10 @@ require vim.inc | |||
2 | 2 | ||
3 | PROVIDES = "xxd" | 3 | PROVIDES = "xxd" |
4 | 4 | ||
5 | PACKAGECONFIG_class-native = "" | 5 | PACKAGECONFIG:class-native = "" |
6 | BBCLASSEXTEND = "native nativesdk" | 6 | BBCLASSEXTEND = "native nativesdk" |
7 | 7 | ||
8 | ALTERNATIVE_${PN}_append = " xxd" | 8 | ALTERNATIVE:${PN}:append = " xxd" |
9 | ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd" | 9 | ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd" |
10 | ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd" | 10 | ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd" |
11 | 11 | ||