[oe] [meta-oe][PATCH v2] vim: add recipe for vim-tiny

[Martin Jansa]

http://permalink.gmane.org/gmane.comp.handhelds.openembedded/66016

On Mon, Jan 12, 2015 at 4:30 AM, Huang, Jie (Jackie) <
Jackie.Huang at windriver.com> wrote:

> Ping, I see the state in patchwork is "Changes Requested" but I don't see
> any comment for this,
> I'm not sure what need to be changed.
>
> Thanks,
> Jackie
>
> > -----Original Message-----
> > From: openembedded-devel-bounces at lists.openembedded.org [mailto:
> openembedded-devel-
> > bounces at lists.openembedded.org] On Behalf Of Huang, Jie (Jackie)
> > Sent: Friday, December 19, 2014 2:17 PM
> > To: openembedded-devel at lists.openembedded.org; Martin.Jansa at gmail.com;
> > paul at paulbarker.me.uk; raj.khem at gmail.com
> > Subject: Re: [oe] [meta-oe][PATCH v2] vim: add recipe for vim-tiny
> >
> > Ping.
> >
> > > -----Original Message-----
> > > From: openembedded-devel-bounces at lists.openembedded.org
> > > [mailto:openembedded-devel- bounces at lists.openembedded.org] On Behalf
> > > Of jackie.huang at windriver.com
> > > Sent: Thursday, November 06, 2014 4:22 PM
> > > To: openembedded-devel at lists.openembedded.org; Martin.Jansa at gmail.com;
> > > paul at paulbarker.me.uk; raj.khem at gmail.com
> > > Subject: [oe] [meta-oe][PATCH v2] vim: add recipe for vim-tiny
> > >
> > > From: Jackie Huang <jackie.huang at windriver.com>
> > >
> > > Changes:
> > > - Add bb for vim-tiny based on vim.bb
> > > - Change PACKAGECONFIG and do_install for vim-tiny
> > > - Change BPN to vim in vim.bb so it works fine when required by
> > > vim-tiny
> > > - Add proper alternative links for vim and vim-tiny to avoid conflicts
> > > - Don't use do_install_append in vim.bb so it works fine when required
> > > by vim-tiny
> > >
> > > Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
> > > ---
> > >  meta-oe/recipes-support/vim/vim-tiny_7.4.481.bb | 13 +++++++++++++
> > >  meta-oe/recipes-support/vim/vim_7.4.481.bb      | 20
> +++++++++++++-------
> > >  2 files changed, 26 insertions(+), 7 deletions(-)  create mode 100644
> > > meta-oe/recipes- support/vim/vim-tiny_7.4.481.bb
> > >
> > > diff --git a/meta-oe/recipes-support/vim/vim-tiny_7.4.481.bb
> > > b/meta-oe/recipes-support/vim/vim-
> > > tiny_7.4.481.bb
> > > new file mode 100644
> > > index 0000000..bb8f2b7
> > > --- /dev/null
> > > +++ b/meta-oe/recipes-support/vim/vim-tiny_7.4.481.bb
> > > @@ -0,0 +1,13 @@
> > > +require vim_${PV}.bb
> > > +
> > > +SUMMARY += " (with tiny features)"
> > > +
> > > +PACKAGECONFIG += "tiny"
> > > +
> > > +do_install() {
> > > +    install -d ${D}/${bindir}
> > > +    install -m 0755 ${S}/vim ${D}/${bindir}/vim.tiny }
> > > +
> > > +ALTERNATIVE_PRIORITY = "90"
> > > +ALTERNATIVE_TARGET = "${bindir}/vim.tiny"
> > > diff --git a/meta-oe/recipes-support/vim/vim_7.4.481.bb
> > > b/meta-oe/recipes- support/vim/vim_7.4.481.bb index b85ff63..7490229
> > > 100644
> > > --- a/meta-oe/recipes-support/vim/vim_7.4.481.bb
> > > +++ b/meta-oe/recipes-support/vim/vim_7.4.481.bb
> > > @@ -12,9 +12,9 @@ SRC_URI = "hg://
> vim.googlecode.com/hg/;protocol=https;module=vim \  "
> > >  SRCREV = "v7-4-481"
> > >
> > > -S = "${WORKDIR}/${BPN}/src"
> > > +S = "${WORKDIR}/vim/src"
> > >
> > > -VIMDIR =
> "${BPN}${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}"
> > > +VIMDIR =
> "vim${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}"
> > >
> > >  inherit autotools update-alternatives  inherit autotools-brokensep @@
> > > -59,7 +59,9 @@ EXTRA_OECONF = " \
> > >      STRIP=/bin/true \
> > >  "
> > >
> > > -do_install_append() {
> > > +do_install() {
> > > +    autotools_do_install
> > > +
> > >      # Work around rpm picking up csh or awk or perl as a dep
> > >      chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132
> > >      chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk
> > > @@ -67,6 +69,9 @@ do_install_append() {
> > >
> > >      # Install example vimrc from runtime files
> > >      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}
> > >  }
> > >
> > >  PARALLEL_MAKEINST = ""
> > > @@ -97,7 +102,8 @@ RDEPENDS_${PN} = "ncurses-terminfo-base"
> > >  # Recommend that runtime data is installed along with vim
> > > RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc
> ${PN}-common"
> > >
> > > -ALTERNATIVE_${PN} = "vi"
> > > -ALTERNATIVE_TARGET[vi] = "${bindir}/${BPN}"
> > > -ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
> > > -ALTERNATIVE_PRIORITY[vi] = "100"
> > > +ALTERNATIVE_${PN} = "vi vim"
> > > +ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
> > > +ALTERNATIVE_LINK_NAME[vi] = "${bindir}/vi"
> > > +ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
> > > +ALTERNATIVE_PRIORITY = "100"
> > > --
> > > 2.0.0
> > >
> > > --
> > > _______________________________________________
> > > Openembedded-devel mailing list
> > > Openembedded-devel at lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>