Patchwork [v2] xfce4-screenshooter: Ensure lib directory exists.

login
register
mail settings
Submitter Ash Charles
Date June 10, 2014, 4:36 p.m.
Message ID <1402418201-4389-1-git-send-email-ashcharles@gmail.com>
Download mbox | patch
Permalink /patch/73577/
State Accepted, archived
Headers show

Comments

Ash Charles - June 10, 2014, 4:36 p.m.
Screenshooter autogenerates screenshooter-marshal.[ch] in lib/ during
compilation.  The source directory contains a lib/ but this directory
doesn't exist in a build directory by default so we add one manually.
Really, this should be corrected in the upstream package.

v2: only make lib/ if it doesn't exist

Upstream-Status: pending

Signed-off-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb     | 4 ++++
 1 file changed, 4 insertions(+)
Ash Charles - June 10, 2014, 4:42 p.m.
Hi,

Newbie question:
I sent this correction as a v2 on the patch as committed on
master-next (which, unintentionally meant that I carried over Martin's
SOB).  Is this the correct approach or
1. would you rather a completely new patch to resolve just the issue
as the original has already been committed to master-next
2. would you rather a v2 on the original patch I sent to the list?

thanks,
--Ash

On Tue, Jun 10, 2014 at 9:36 AM, Ash Charles <ashcharles@gmail.com> wrote:
> Screenshooter autogenerates screenshooter-marshal.[ch] in lib/ during
> compilation.  The source directory contains a lib/ but this directory
> doesn't exist in a build directory by default so we add one manually.
> Really, this should be corrected in the upstream package.
>
> v2: only make lib/ if it doesn't exist
>
> Upstream-Status: pending
>
> Signed-off-by: Ash Charles <ashcharles@gmail.com>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  .../recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb     | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
> index 4cda352..0e2e327 100644
> --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
> +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
> @@ -11,5 +11,9 @@ SRC_URI += "file://0001-Fix-panel-plugin-build.patch"
>  SRC_URI[md5sum] = "d0ffea2052a8e70154cf13789070711f"
>  SRC_URI[sha256sum] = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492"
>
> +do_compile_prepend() {
> +       mkdir -p lib
> +}
> +
>  FILES_${PN} += "${datadir}/xfce4/panel/plugins \
>          ${libdir}/xfce4/panel/plugins"
> --
> 1.8.3.2
>
Martin Jansa - June 10, 2014, 5:11 p.m.
On Tue, Jun 10, 2014 at 09:42:17AM -0700, Ash Charles wrote:
> Hi,
> 
> Newbie question:
> I sent this correction as a v2 on the patch as committed on
> master-next (which, unintentionally meant that I carried over Martin's
> SOB).  Is this the correct approach or

I don't mind my SOB being carried (I can still remove it when
re-cherry-picking to master next)

> 1. would you rather a completely new patch to resolve just the issue
> as the original has already been committed to master-next

No, being in master-next only means that it's being tested in my Jenkins
builds, I'm rebasing master-next every time I push something to master,
so I'll just replace original patch with v2 in master-next for next Jenkins
build.

> 2. would you rather a v2 on the original patch I sent to the list?

Sending PATCHv2 with --in-reply-to as you did now, is the best for me, thanks

> thanks,
> --Ash
> 
> On Tue, Jun 10, 2014 at 9:36 AM, Ash Charles <ashcharles@gmail.com> wrote:
> > Screenshooter autogenerates screenshooter-marshal.[ch] in lib/ during
> > compilation.  The source directory contains a lib/ but this directory
> > doesn't exist in a build directory by default so we add one manually.
> > Really, this should be corrected in the upstream package.
> >
> > v2: only make lib/ if it doesn't exist
> >
> > Upstream-Status: pending
> >
> > Signed-off-by: Ash Charles <ashcharles@gmail.com>
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  .../recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb     | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
> > index 4cda352..0e2e327 100644
> > --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
> > +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
> > @@ -11,5 +11,9 @@ SRC_URI += "file://0001-Fix-panel-plugin-build.patch"
> >  SRC_URI[md5sum] = "d0ffea2052a8e70154cf13789070711f"
> >  SRC_URI[sha256sum] = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492"
> >
> > +do_compile_prepend() {
> > +       mkdir -p lib
> > +}
> > +
> >  FILES_${PN} += "${datadir}/xfce4/panel/plugins \
> >          ${libdir}/xfce4/panel/plugins"
> > --
> > 1.8.3.2
> >
Martin Jansa - June 10, 2014, 5:17 p.m.
On Tue, Jun 10, 2014 at 07:11:43PM +0200, Martin Jansa wrote:
> On Tue, Jun 10, 2014 at 09:42:17AM -0700, Ash Charles wrote:
> > Hi,
> > 
> > Newbie question:
> > I sent this correction as a v2 on the patch as committed on
> > master-next (which, unintentionally meant that I carried over Martin's
> > SOB).  Is this the correct approach or
> 
> I don't mind my SOB being carried (I can still remove it when
> re-cherry-picking to master next)
> 
> > 1. would you rather a completely new patch to resolve just the issue
> > as the original has already been committed to master-next
> 
> No, being in master-next only means that it's being tested in my Jenkins
> builds, I'm rebasing master-next every time I push something to master,
> so I'll just replace original patch with v2 in master-next for next Jenkins
> build.
> 
> > 2. would you rather a v2 on the original patch I sent to the list?
> 
> Sending PATCHv2 with --in-reply-to as you did now, is the best for me, thanks

Two smaller nitpicks I've noticed when cherry-picking v2.

1) Subject prefix should be PATCHv2 (not just v2) for people who filter
patches based on subject.

2) vN changes in commit message are usually written bellow --- so that
they are in e-mail for reviewers to see, but not part of final commit
message (usually the incremental process isn't interesting in final
commit, if it is, it should be mentioned in proper commit message).

3) Upstream-Status this belongs to individual .patch files (applied
through SRC_URI), not in commit message of whole "metadata change".

I've removed v2:.* and Upstream-Status when cherry-picking it, so no
need to send v3 this time.

> > thanks,
> > --Ash
> > 
> > On Tue, Jun 10, 2014 at 9:36 AM, Ash Charles <ashcharles@gmail.com> wrote:
> > > Screenshooter autogenerates screenshooter-marshal.[ch] in lib/ during
> > > compilation.  The source directory contains a lib/ but this directory
> > > doesn't exist in a build directory by default so we add one manually.
> > > Really, this should be corrected in the upstream package.
> > >
> > > v2: only make lib/ if it doesn't exist
> > >
> > > Upstream-Status: pending
> > >
> > > Signed-off-by: Ash Charles <ashcharles@gmail.com>
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > >  .../recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb     | 4 ++++
> > >  1 file changed, 4 insertions(+)
> > >
> > > diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
> > > index 4cda352..0e2e327 100644
> > > --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
> > > +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
> > > @@ -11,5 +11,9 @@ SRC_URI += "file://0001-Fix-panel-plugin-build.patch"
> > >  SRC_URI[md5sum] = "d0ffea2052a8e70154cf13789070711f"
> > >  SRC_URI[sha256sum] = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492"
> > >
> > > +do_compile_prepend() {
> > > +       mkdir -p lib
> > > +}
> > > +
> > >  FILES_${PN} += "${datadir}/xfce4/panel/plugins \
> > >          ${libdir}/xfce4/panel/plugins"
> > > --
> > > 1.8.3.2
> > >
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
Ash Charles - June 10, 2014, 5:20 p.m.
On Tue, Jun 10, 2014 at 10:11 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> No, being in master-next only means that it's being tested in my Jenkins
> builds, I'm rebasing master-next every time I push something to master,
> so I'll just replace original patch with v2 in master-next for next Jenkins
> build.
Okay---perfect.  That makes sense.
>
>> 2. would you rather a v2 on the original patch I sent to the list?
>
> Sending PATCHv2 with --in-reply-to as you did now, is the best for me, thanks
Great.

Thanks,
Ash

Patch

diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
index 4cda352..0e2e327 100644
--- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
+++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
@@ -11,5 +11,9 @@  SRC_URI += "file://0001-Fix-panel-plugin-build.patch"
 SRC_URI[md5sum] = "d0ffea2052a8e70154cf13789070711f"
 SRC_URI[sha256sum] = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492"
 
+do_compile_prepend() {
+	mkdir -p lib
+}
+
 FILES_${PN} += "${datadir}/xfce4/panel/plugins \
         ${libdir}/xfce4/panel/plugins"