Patchwork [meta-oe] vim: workaround nawk dependency problem with RPM

login
register
mail settings
Submitter Peter Bigot
Date Sept. 3, 2013, 7:04 p.m.
Message ID <1378235089-5251-1-git-send-email-pab@pabigot.com>
Download mbox | patch
Permalink /patch/57311/
State Accepted, archived
Commit 53c9a1f55e169e0c7e2d6a3fed51308c316774fb
Headers show

Comments

Peter Bigot - Sept. 3, 2013, 7:04 p.m.
One of the examples has a #!/usr/bin/nawk which tells RPM to add that as a
dep, which we don't want.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta-oe/recipes-support/vim/vim.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Peter Bigot - Sept. 8, 2013, 12:57 p.m.
Ping?  I see this is marked as New, Archived in patchwork so it doesn't 
show up for merge, but can't tell how it got archived.  Is there 
something wrong with it?

On 09/03/2013 02:04 PM, Peter A. Bigot wrote:
> One of the examples has a #!/usr/bin/nawk which tells RPM to add that as a
> dep, which we don't want.
>
> Signed-off-by: Peter A. Bigot <pab@pabigot.com>
> ---
>   meta-oe/recipes-support/vim/vim.inc | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc
> index d7336c2..991ba74 100644
> --- a/meta-oe/recipes-support/vim/vim.inc
> +++ b/meta-oe/recipes-support/vim/vim.inc
> @@ -54,8 +54,9 @@ EXTRA_OECONF = " \
>   "
>   
>   do_install_append() {
> -    # Work around rpm picking up csh as a dep
> +    # Work around rpm picking up csh or awk as a dep
>       chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132
> +    chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/mve.awk
>   
>       # Install example vimrc from runtime files
>       install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${PN}/vimrc
Martin Jansa - Sept. 8, 2013, 1:36 p.m.
On Sun, Sep 08, 2013 at 07:57:47AM -0500, Peter A. Bigot wrote:
> Ping?  I see this is marked as New, Archived in patchwork so it doesn't 
> show up for merge, but can't tell how it got archived.  Is there 
> something wrong with it?

It's in jansa/in-test bundle, see
http://www.openembedded.org/wiki/Patchwork#Multiple_layers_sharing_the_same_oe_project_on_patchwork

> 
> On 09/03/2013 02:04 PM, Peter A. Bigot wrote:
> > One of the examples has a #!/usr/bin/nawk which tells RPM to add that as a
> > dep, which we don't want.
> >
> > Signed-off-by: Peter A. Bigot <pab@pabigot.com>
> > ---
> >   meta-oe/recipes-support/vim/vim.inc | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc
> > index d7336c2..991ba74 100644
> > --- a/meta-oe/recipes-support/vim/vim.inc
> > +++ b/meta-oe/recipes-support/vim/vim.inc
> > @@ -54,8 +54,9 @@ EXTRA_OECONF = " \
> >   "
> >   
> >   do_install_append() {
> > -    # Work around rpm picking up csh as a dep
> > +    # Work around rpm picking up csh or awk as a dep
> >       chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132
> > +    chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/mve.awk
> >   
> >       # Install example vimrc from runtime files
> >       install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${PN}/vimrc
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc
index d7336c2..991ba74 100644
--- a/meta-oe/recipes-support/vim/vim.inc
+++ b/meta-oe/recipes-support/vim/vim.inc
@@ -54,8 +54,9 @@  EXTRA_OECONF = " \
 "
 
 do_install_append() {
-    # Work around rpm picking up csh as a dep
+    # Work around rpm picking up csh or awk as a dep
     chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132
+    chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/mve.awk
 
     # Install example vimrc from runtime files
     install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${PN}/vimrc