* [meta-xfce][PATCH] xfce4-screenshooter: Ensure lib directory exists. @ 2014-05-26 17:43 Ash Charles 2014-06-10 11:21 ` Martin Jansa 0 siblings, 1 reply; 7+ messages in thread From: Ash Charles @ 2014-05-26 17:43 UTC (permalink / raw) To: openembedded-devel 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. Upstream-Status: pending Signed-off-by: Ash Charles <ashcharles@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..271f9c0 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 lib +} + FILES_${PN} += "${datadir}/xfce4/panel/plugins \ ${libdir}/xfce4/panel/plugins" -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [meta-xfce][PATCH] xfce4-screenshooter: Ensure lib directory exists. 2014-05-26 17:43 [meta-xfce][PATCH] xfce4-screenshooter: Ensure lib directory exists Ash Charles @ 2014-06-10 11:21 ` Martin Jansa 2014-06-10 16:36 ` [Patch v2] " Ash Charles 0 siblings, 1 reply; 7+ messages in thread From: Martin Jansa @ 2014-06-10 11:21 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 2345 bytes --] On Mon, May 26, 2014 at 10:43:15AM -0700, Ash Charles 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. > > Upstream-Status: pending Please create it only when it doesn't exist ERROR: Logfile of failure stored in: /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/xfce4-screenshooter/1.8.1-r0/temp/log.do_compile.3584 Log data follows: | DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc', 'bit-64', 'x86_64-linux', 'common'] | DEBUG: Executing shell function do_compile | mkdir: cannot create directory `lib': File exists | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/xfce4-screenshooter/1.8.1-r0/temp/log.do_compile.3584) NOTE: recipe xfce4-screenshooter-1.8.1-r0: task do_compile: Failed > > Signed-off-by: Ash Charles <ashcharles@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..271f9c0 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 lib > +} > + > FILES_${PN} += "${datadir}/xfce4/panel/plugins \ > ${libdir}/xfce4/panel/plugins" > -- > 1.8.3.2 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Patch v2] xfce4-screenshooter: Ensure lib directory exists. 2014-06-10 11:21 ` Martin Jansa @ 2014-06-10 16:36 ` Ash Charles 2014-06-10 16:42 ` Ash Charles 0 siblings, 1 reply; 7+ messages in thread From: Ash Charles @ 2014-06-10 16:36 UTC (permalink / raw) To: openembedded-devel 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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Patch v2] xfce4-screenshooter: Ensure lib directory exists. 2014-06-10 16:36 ` [Patch v2] " Ash Charles @ 2014-06-10 16:42 ` Ash Charles 2014-06-10 17:11 ` Martin Jansa 0 siblings, 1 reply; 7+ messages in thread From: Ash Charles @ 2014-06-10 16:42 UTC (permalink / raw) To: openembedded-devel 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 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Patch v2] xfce4-screenshooter: Ensure lib directory exists. 2014-06-10 16:42 ` Ash Charles @ 2014-06-10 17:11 ` Martin Jansa 2014-06-10 17:17 ` Martin Jansa 2014-06-10 17:20 ` Ash Charles 0 siblings, 2 replies; 7+ messages in thread From: Martin Jansa @ 2014-06-10 17:11 UTC (permalink / raw) To: Ash Charles; +Cc: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 2484 bytes --] 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 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Patch v2] xfce4-screenshooter: Ensure lib directory exists. 2014-06-10 17:11 ` Martin Jansa @ 2014-06-10 17:17 ` Martin Jansa 2014-06-10 17:20 ` Ash Charles 1 sibling, 0 replies; 7+ messages in thread From: Martin Jansa @ 2014-06-10 17:17 UTC (permalink / raw) To: Ash Charles; +Cc: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 3422 bytes --] 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 -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Patch v2] xfce4-screenshooter: Ensure lib directory exists. 2014-06-10 17:11 ` Martin Jansa 2014-06-10 17:17 ` Martin Jansa @ 2014-06-10 17:20 ` Ash Charles 1 sibling, 0 replies; 7+ messages in thread From: Ash Charles @ 2014-06-10 17:20 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-06-10 17:20 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-26 17:43 [meta-xfce][PATCH] xfce4-screenshooter: Ensure lib directory exists Ash Charles 2014-06-10 11:21 ` Martin Jansa 2014-06-10 16:36 ` [Patch v2] " Ash Charles 2014-06-10 16:42 ` Ash Charles 2014-06-10 17:11 ` Martin Jansa 2014-06-10 17:17 ` Martin Jansa 2014-06-10 17:20 ` Ash Charles
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.