<div dir="ltr"><div dir="ltr">Actually the BBCLASSEXTEND = "native" as well, as we don't need both vim recipes to provide xxd-native.<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, May 17, 2019 at 4:27 PM Martin Jansa <<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div>To simplify meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" target="_blank">vim-tiny_8.1.1240.bb</a> which currently has:</div><div><br></div><div>PROVIDES_remove = "xxd"</div><div>ALTERNATIVE_${PN}_remove = "xxd"</div><div><br></div><div>Can you move xxd from the .inc file and put it only in <a href="http://vim_8.1.1240.bb" target="_blank">vim_8.1.1240.bb</a>?</div><div><br></div></div></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, May 17, 2019 at 3:53 PM Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Previously vim-tiny would include the vim recipe wholesale;<br>
this meant that they had to be upgraded in a single transaction<br>
which devtool cannot cope with. This thwarted the latest AUH<br>
run in particular.<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
---<br>
meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a> | 2 +-<br>
meta/recipes-support/vim/vim.inc | 141 +++++++++++++++++<br>
meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a> | 142 +-----------------<br>
3 files changed, 143 insertions(+), 142 deletions(-)<br>
create mode 100644 meta/recipes-support/vim/vim.inc<br>
<br>
diff --git a/meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a> b/meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a><br>
index 74464833adb..139e626e444 100644<br>
--- a/meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a><br>
+++ b/meta/recipes-support/vim/<a href="http://vim-tiny_8.1.1240.bb" rel="noreferrer" target="_blank">vim-tiny_8.1.1240.bb</a><br>
@@ -1,4 +1,4 @@<br>
-require vim_${PV}.bb<br>
+require vim.inc<br>
<br>
SUMMARY += " (with tiny features)"<br>
<br>
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc<br>
new file mode 100644<br>
index 00000000000..f5c74684bfa<br>
--- /dev/null<br>
+++ b/meta/recipes-support/vim/vim.inc<br>
@@ -0,0 +1,141 @@<br>
+SUMMARY = "Vi IMproved - enhanced vi editor"<br>
+SECTION = "console/utils"<br>
+<br>
+PROVIDES = "xxd"<br>
+DEPENDS = "ncurses gettext-native"<br>
+# vimdiff doesn't like busybox diff<br>
+RSUGGESTS_${PN} = "diffutils"<br>
+LICENSE = "vim"<br>
+LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72"<br>
+<br>
+SRC_URI = "git://<a href="http://github.com/vim/vim.git" rel="noreferrer" target="_blank">github.com/vim/vim.git</a> \<br>
+ file://disable_acl_header_check.patch \<br>
+ file://vim-add-knob-whether-elf.h-are-checked.patch \<br>
+ file://0001-src-Makefile-improve-reproducibility.patch \<br>
+"<br>
+SRCREV = "d96dbd6f95ea22f609042cc9c6272f14a21ff1a5"<br>
+<br>
+S = "${WORKDIR}/git"<br>
+<br>
+VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"<br>
+<br>
+inherit autotools-brokensep update-alternatives<br>
+<br>
+CLEANBROKEN = "1"<br>
+<br>
+# vim <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> contains functions which got 'dropped' by autotools.bbclass<br>
+do_configure () {<br>
+ cd src<br>
+ rm -f auto/*<br>
+ touch auto/<a href="http://config.mk" rel="noreferrer" target="_blank">config.mk</a><br>
+ aclocal<br>
+ autoconf<br>
+ cd ..<br>
+ oe_runconf<br>
+ touch src/auto/configure<br>
+ touch src/auto/<a href="http://config.mk" rel="noreferrer" target="_blank">config.mk</a> src/auto/config.h<br>
+}<br>
+<br>
+do_compile() {<br>
+ # We do not support fully / correctly the following locales. Attempting<br>
+ # to use these with msgfmt in order to update the ".desktop" files exposes<br>
+ # this problem and leads to the compile failing.<br>
+ for LOCALE in cs fr ko pl sk zh_CN zh_TW;do<br>
+ echo -n > src/po/${LOCALE}.po<br>
+ done<br>
+ autotools_do_compile<br>
+}<br>
+<br>
+#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny<br>
+PACKAGECONFIG ??= ""<br>
+PACKAGECONFIG += " \<br>
+ ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \<br>
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \<br>
+"<br>
+PACKAGECONFIG_class-native = ""<br>
+<br>
+PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"<br>
+PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"<br>
+PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"<br>
+PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,,"<br>
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"<br>
+PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils,"<br>
+<br>
+EXTRA_OECONF = " \<br>
+ --disable-gpm \<br>
+ --disable-gtktest \<br>
+ --disable-xim \<br>
+ --disable-netbeans \<br>
+ --with-tlib=ncurses \<br>
+ ac_cv_small_wchar_t=no \<br>
+ vim_cv_getcwd_broken=no \<br>
+ vim_cv_memmove_handles_overlap=yes \<br>
+ vim_cv_stat_ignores_slash=no \<br>
+ vim_cv_terminfo=yes \<br>
+ vim_cv_tgetent=non-zero \<br>
+ vim_cv_toupper_broken=no \<br>
+ vim_cv_tty_group=world \<br>
+ STRIP=/bin/true \<br>
+"<br>
+<br>
+do_install() {<br>
+ autotools_do_install<br>
+<br>
+ # Work around file-rdeps picking up csh, awk, perl or python as a dep<br>
+ chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132<br>
+ chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk<br>
+ chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl<br>
+ chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py<br>
+<br>
+ # Install example vimrc from runtime files<br>
+ install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc<br>
+<br>
+ # we use --with-features=big as default<br>
+ mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}<br>
+<br>
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'true', 'false', d)}; then<br>
+ # The mouse being autoenabled is just annoying in xfce4-terminal (mouse<br>
+ # drag make vim go into visual mode and there is no right click menu),<br>
+ # delete the block.<br>
+ sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc<br>
+ fi<br>
+}<br>
+<br>
+PARALLEL_MAKEINST = ""<br>
+<br>
+PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools"<br>
+FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax"<br>
+FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"<br>
+FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"<br>
+FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"<br>
+FILES_${PN}-data = "${datadir}/${BPN}"<br>
+FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools"<br>
+FILES_${PN}-common = " \<br>
+ ${datadir}/${BPN}/${VIMDIR}/*.vim \<br>
+ ${datadir}/${BPN}/${VIMDIR}/autoload \<br>
+ ${datadir}/${BPN}/${VIMDIR}/colors \<br>
+ ${datadir}/${BPN}/${VIMDIR}/compiler \<br>
+ ${datadir}/${BPN}/${VIMDIR}/ftplugin \<br>
+ ${datadir}/${BPN}/${VIMDIR}/indent \<br>
+ ${datadir}/${BPN}/${VIMDIR}/keymap \<br>
+ ${datadir}/${BPN}/${VIMDIR}/lang \<br>
+ ${datadir}/${BPN}/${VIMDIR}/macros \<br>
+ ${datadir}/${BPN}/${VIMDIR}/plugin \<br>
+ ${datadir}/${BPN}/${VIMDIR}/print \<br>
+ ${datadir}/${BPN}/${VIMDIR}/spell \<br>
+ ${datadir}/icons \<br>
+"<br>
+<br>
+RDEPENDS_${BPN} = "ncurses-terminfo-base"<br>
+# Recommend that runtime data is installed along with vim<br>
+RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"<br>
+<br>
+ALTERNATIVE_${PN} = "vi vim xxd"<br>
+ALTERNATIVE_PRIORITY = "100"<br>
+ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"<br>
+ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"<br>
+ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"<br>
+ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"<br>
+ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"<br>
+<br>
+BBCLASSEXTEND = "native"<br>
diff --git a/meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a> b/meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a><br>
index f5c74684bfa..baaaacc0b77 100644<br>
--- a/meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a><br>
+++ b/meta/recipes-support/vim/<a href="http://vim_8.1.1240.bb" rel="noreferrer" target="_blank">vim_8.1.1240.bb</a><br>
@@ -1,141 +1 @@<br>
-SUMMARY = "Vi IMproved - enhanced vi editor"<br>
-SECTION = "console/utils"<br>
-<br>
-PROVIDES = "xxd"<br>
-DEPENDS = "ncurses gettext-native"<br>
-# vimdiff doesn't like busybox diff<br>
-RSUGGESTS_${PN} = "diffutils"<br>
-LICENSE = "vim"<br>
-LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72"<br>
-<br>
-SRC_URI = "git://<a href="http://github.com/vim/vim.git" rel="noreferrer" target="_blank">github.com/vim/vim.git</a> \<br>
- file://disable_acl_header_check.patch \<br>
- file://vim-add-knob-whether-elf.h-are-checked.patch \<br>
- file://0001-src-Makefile-improve-reproducibility.patch \<br>
-"<br>
-SRCREV = "d96dbd6f95ea22f609042cc9c6272f14a21ff1a5"<br>
-<br>
-S = "${WORKDIR}/git"<br>
-<br>
-VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"<br>
-<br>
-inherit autotools-brokensep update-alternatives<br>
-<br>
-CLEANBROKEN = "1"<br>
-<br>
-# vim <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> contains functions which got 'dropped' by autotools.bbclass<br>
-do_configure () {<br>
- cd src<br>
- rm -f auto/*<br>
- touch auto/<a href="http://config.mk" rel="noreferrer" target="_blank">config.mk</a><br>
- aclocal<br>
- autoconf<br>
- cd ..<br>
- oe_runconf<br>
- touch src/auto/configure<br>
- touch src/auto/<a href="http://config.mk" rel="noreferrer" target="_blank">config.mk</a> src/auto/config.h<br>
-}<br>
-<br>
-do_compile() {<br>
- # We do not support fully / correctly the following locales. Attempting<br>
- # to use these with msgfmt in order to update the ".desktop" files exposes<br>
- # this problem and leads to the compile failing.<br>
- for LOCALE in cs fr ko pl sk zh_CN zh_TW;do<br>
- echo -n > src/po/${LOCALE}.po<br>
- done<br>
- autotools_do_compile<br>
-}<br>
-<br>
-#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny<br>
-PACKAGECONFIG ??= ""<br>
-PACKAGECONFIG += " \<br>
- ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \<br>
- ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \<br>
-"<br>
-PACKAGECONFIG_class-native = ""<br>
-<br>
-PACKAGECONFIG[gtkgui] = "--enable-gui=gtk2,--enable-gui=no,gtk+,"<br>
-PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"<br>
-PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"<br>
-PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,,"<br>
-PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"<br>
-PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils,"<br>
-<br>
-EXTRA_OECONF = " \<br>
- --disable-gpm \<br>
- --disable-gtktest \<br>
- --disable-xim \<br>
- --disable-netbeans \<br>
- --with-tlib=ncurses \<br>
- ac_cv_small_wchar_t=no \<br>
- vim_cv_getcwd_broken=no \<br>
- vim_cv_memmove_handles_overlap=yes \<br>
- vim_cv_stat_ignores_slash=no \<br>
- vim_cv_terminfo=yes \<br>
- vim_cv_tgetent=non-zero \<br>
- vim_cv_toupper_broken=no \<br>
- vim_cv_tty_group=world \<br>
- STRIP=/bin/true \<br>
-"<br>
-<br>
-do_install() {<br>
- autotools_do_install<br>
-<br>
- # Work around file-rdeps picking up csh, awk, perl or python as a dep<br>
- chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132<br>
- chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk<br>
- chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl<br>
- chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py<br>
-<br>
- # Install example vimrc from runtime files<br>
- install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc<br>
-<br>
- # we use --with-features=big as default<br>
- mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}<br>
-<br>
- if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'true', 'false', d)}; then<br>
- # The mouse being autoenabled is just annoying in xfce4-terminal (mouse<br>
- # drag make vim go into visual mode and there is no right click menu),<br>
- # delete the block.<br>
- sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc<br>
- fi<br>
-}<br>
-<br>
-PARALLEL_MAKEINST = ""<br>
-<br>
-PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools"<br>
-FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax"<br>
-FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"<br>
-FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"<br>
-FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"<br>
-FILES_${PN}-data = "${datadir}/${BPN}"<br>
-FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools"<br>
-FILES_${PN}-common = " \<br>
- ${datadir}/${BPN}/${VIMDIR}/*.vim \<br>
- ${datadir}/${BPN}/${VIMDIR}/autoload \<br>
- ${datadir}/${BPN}/${VIMDIR}/colors \<br>
- ${datadir}/${BPN}/${VIMDIR}/compiler \<br>
- ${datadir}/${BPN}/${VIMDIR}/ftplugin \<br>
- ${datadir}/${BPN}/${VIMDIR}/indent \<br>
- ${datadir}/${BPN}/${VIMDIR}/keymap \<br>
- ${datadir}/${BPN}/${VIMDIR}/lang \<br>
- ${datadir}/${BPN}/${VIMDIR}/macros \<br>
- ${datadir}/${BPN}/${VIMDIR}/plugin \<br>
- ${datadir}/${BPN}/${VIMDIR}/print \<br>
- ${datadir}/${BPN}/${VIMDIR}/spell \<br>
- ${datadir}/icons \<br>
-"<br>
-<br>
-RDEPENDS_${BPN} = "ncurses-terminfo-base"<br>
-# Recommend that runtime data is installed along with vim<br>
-RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"<br>
-<br>
-ALTERNATIVE_${PN} = "vi vim xxd"<br>
-ALTERNATIVE_PRIORITY = "100"<br>
-ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"<br>
-ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"<br>
-ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"<br>
-ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"<br>
-ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"<br>
-<br>
-BBCLASSEXTEND = "native"<br>
+require vim.inc<br>
-- <br>
2.17.1<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>
</blockquote></div>