[meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Ash Charles]

The po subdirectory is not copied over to the build directory of
found on the VPATH for an out-of-tree build so we symlink it over.

Signed-off-by: Ash Charles <ashcharles@gmail.com>
---
 meta-oe/recipes-support/eject/eject_2.1.5.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index c47c653..5c9c749 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -14,7 +14,9 @@ SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e
 
 S = "${WORKDIR}/${BPN}"
 
-PR = "r1"
+do_compile_prepend() {
+    ln -s ${S}/po po
+}
 
 ALTERNATIVE_${PN} = "volname eject"
 ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
-- 
1.8.3.2

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Otavio Salvador]

On Mon, May 26, 2014 at 4:27 PM, Ash Charles <ashcharles@gmail.com> wrote:
> The po subdirectory is not copied over to the build directory of
> found on the VPATH for an out-of-tree build so we symlink it over.
>
> Signed-off-by: Ash Charles <ashcharles@gmail.com>
> ---
>  meta-oe/recipes-support/eject/eject_2.1.5.bb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> index c47c653..5c9c749 100644
> --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
> +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> @@ -14,7 +14,9 @@ SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e
>
>  S = "${WORKDIR}/${BPN}"
>
> -PR = "r1"

You cannot remove the PR without a new version coming out; if you do,
package feeds will get the  revision going backwards.

> +do_compile_prepend() {
> +    ln -s ${S}/po po
> +}

This is not the right fix. Please fix the po/Makefile to use $(srcdir)
and like so you don't need to link it over.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Ash Charles]

Hi Otavio,
On Mon, May 26, 2014 at 1:31 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> You cannot remove the PR without a new version coming out; if you do,
> package feeds will get the  revision going backwards.
Oh duh!  Thanks.
>
>> +do_compile_prepend() {
>> +    ln -s ${S}/po po
>> +}
>
> This is not the right fix. Please fix the po/Makefile to use $(srcdir)
> and like so you don't need to link it over.
Okay---that makes sense.  I'll send a v2 with these fixes.

Thanks for the feedback.
--Ash

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Ash Charles]

On Mon, May 26, 2014 at 3:09 PM, Ash Charles <ashcharles@gmail.com> wrote:
> Okay---that makes sense.  I'll send a v2 with these fixes.
I tried the patch below and sent it along to the upstream maintainer
as it fixes the problem when I build locally.  When bitbaking though,
it looks like the autotools.bbclass dispose of the $(srcdir)
change...darn!  Any suggestions? This is readily fixed with
autotools-brokensep....

--- eject/Makefile.in   2006-06-03 18:59:08.000000000 -0700
+++ eject/Makefile.in   2014-05-26 15:58:08.031605669 -0700
@@ -72,7 +72,7 @@
 eject_SOURCES = eject.c
 volname_SOURCES = volname.c

-@USE_NLS_TRUE@SUBDIRS = po
+@USE_NLS_TRUE@SUBDIRS = $(srcdir)/po

 AM_CPPFLAGS = -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
 AM_CFLAGS = -Wall $(RPM_OPT_FLAGS)

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Otavio Salvador]

On Mon, May 26, 2014 at 9:46 PM, Ash Charles <ashcharles@gmail.com> wrote:
> On Mon, May 26, 2014 at 3:09 PM, Ash Charles <ashcharles@gmail.com> wrote:
>> Okay---that makes sense.  I'll send a v2 with these fixes.
> I tried the patch below and sent it along to the upstream maintainer
> as it fixes the problem when I build locally.  When bitbaking though,
> it looks like the autotools.bbclass dispose of the $(srcdir)
> change...darn!  Any suggestions? This is readily fixed with
> autotools-brokensep....
>
> --- eject/Makefile.in   2006-06-03 18:59:08.000000000 -0700
> +++ eject/Makefile.in   2014-05-26 15:58:08.031605669 -0700
> @@ -72,7 +72,7 @@
>  eject_SOURCES = eject.c
>  volname_SOURCES = volname.c
>
> -@USE_NLS_TRUE@SUBDIRS = po
> +@USE_NLS_TRUE@SUBDIRS = $(srcdir)/po

@top_srcdir@?

>  AM_CPPFLAGS = -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
>  AM_CFLAGS = -Wall $(RPM_OPT_FLAGS)
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]

On Mon, May 26, 2014 at 12:27:39PM -0700, Ash Charles wrote:
> The po subdirectory is not copied over to the build directory of
> found on the VPATH for an out-of-tree build so we symlink it over.
> 
> Signed-off-by: Ash Charles <ashcharles@gmail.com>
> ---
>  meta-oe/recipes-support/eject/eject_2.1.5.bb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> index c47c653..5c9c749 100644
> --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
> +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> @@ -14,7 +14,9 @@ SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e
>  
>  S = "${WORKDIR}/${BPN}"
>  
> -PR = "r1"

This will make version going backwards and we don't want that, you can
drop PR only when incrementing PV or PE.

> +do_compile_prepend() {
> +    ln -s ${S}/po po
> +}
>  
>  ALTERNATIVE_${PN} = "volname eject"
>  ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
> -- 
> 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: 205 bytes --]

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Ash Charles]

On Tue, May 27, 2014 at 2:18 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> This will make version going backwards and we don't want that, you can
> drop PR only when incrementing PV or PE.
For sure.  I'l do this for v2.

@Otavio: I tried modifying the variable as you suggested as well as a
couple other ways in both the Makefile.in and Makefile.am.  Because
autoreconf gets run in do_configure though, any changes either break
the configuration step or get wiped out.  The source code explicitly
mentions that the Makefile in the po subdirectory is not using
automake, I'm stuck either copying the (100K) po subdir over to the
build directory or resorting to automake-brokensep.  What is
preferable for my updated patch?  I'm keen to un-break my build ;-).

--Ash

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Otavio Salvador]

On Tue, May 27, 2014 at 12:15 PM, Ash Charles <ashcharles@gmail.com> wrote:
> On Tue, May 27, 2014 at 2:18 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> This will make version going backwards and we don't want that, you can
>> drop PR only when incrementing PV or PE.
> For sure.  I'l do this for v2.
>
> @Otavio: I tried modifying the variable as you suggested as well as a
> couple other ways in both the Makefile.in and Makefile.am.  Because
> autoreconf gets run in do_configure though, any changes either break
> the configuration step or get wiped out.  The source code explicitly
> mentions that the Makefile in the po subdirectory is not using
> automake, I'm stuck either copying the (100K) po subdir over to the
> build directory or resorting to automake-brokensep.  What is
> preferable for my updated patch?  I'm keen to un-break my build ;-).

You need to change the configure.am (or .in) and Makefile.am.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[meta-oe][PATCH v2] eject: copy po subdirectory for out-of-tree build

[Ash Charles]

The po subdirectory found on the VPATH for an out-of-tree build so we
copy it over. See [1] for discussion.

[1] http://lists.openembedded.org/pipermail/openembedded-devel/2014-May/096052.html

Signed-off-by: Ash Charles <ashcharles@gmail.com>
---
 meta-oe/recipes-support/eject/eject_2.1.5.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index c47c653..b6e181f 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -16,6 +16,11 @@ S = "${WORKDIR}/${BPN}"
 
 PR = "r1"
 
+do_compile_prepend() {
+    # PO subdir must be in build directory
+    cp -r ${S}/po ${B}/po
+}
+
 ALTERNATIVE_${PN} = "volname eject"
 ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
 ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
-- 
1.8.3.2

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Ash Charles]

On Tue, May 27, 2014 at 8:32 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> You need to change the configure.am (or .in) and Makefile.am.
Shucks---my knowledge of autotools is just too weak to correct this
properly.  I suspect the AM_PO_SUBDIRS has some special magic.  In any
case, I've sent a v2 with my (bad) fix in case it is useful to someone
else.

--Ash

Re: [meta-oe][PATCH v2] eject: copy po subdirectory for out-of-tree build

[Otavio Salvador]

On Tue, May 27, 2014 at 1:43 PM, Ash Charles <ashcharles@gmail.com> wrote:
> The po subdirectory found on the VPATH for an out-of-tree build so we
> copy it over. See [1] for discussion.
>
> [1] http://lists.openembedded.org/pipermail/openembedded-devel/2014-May/096052.html
>
> Signed-off-by: Ash Charles <ashcharles@gmail.com>

After looking at the eject code, I think this is the best alternative we have.

Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Khem Raj]

On Tue, May 27, 2014 at 8:32 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> You need to change the configure.am (or .in) and Makefile.am.

configure.ac is the new norm not configure.am

Re: [meta-oe][PATCH] eject: link po subdirectory for out-of-tree build

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2477 bytes --]

On Mon, May 26, 2014 at 12:27:39PM -0700, Ash Charles wrote:
> The po subdirectory is not copied over to the build directory of
> found on the VPATH for an out-of-tree build so we symlink it over.
> 
> Signed-off-by: Ash Charles <ashcharles@gmail.com>
> ---
>  meta-oe/recipes-support/eject/eject_2.1.5.bb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> index c47c653..5c9c749 100644
> --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
> +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> @@ -14,7 +14,9 @@ SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e
>  
>  S = "${WORKDIR}/${BPN}"
>  
> -PR = "r1"
> +do_compile_prepend() {
> +    ln -s ${S}/po po
> +}

Fails in world builds:

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/eject/2.1.5-r1/temp/log.do_compile.29499)
ERROR: Logfile of failure stored in: /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/temp/log.do_compile.29499  
Log data follows:
| DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc', 'bit-64', 'x86_64-linux', 'common']
| DEBUG: Executing shell function do_compile
| cp: cannot copy a directory, `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po', into itself, `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/po'
| 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/eject/2.1.5-r1/temp/log.do_compile.29499)
NOTE: recipe eject-2.1.5-r1: task do_compile: Failed
ERROR: Task 34 (/home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb, do_compile) failed with exit code '1'


>  
>  ALTERNATIVE_${PN} = "volname eject"
>  ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
> -- 
> 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 --]

[Patch v3] eject: copy po subdirectory for out-of-tree build

[Ash Charles]

The po subdirectory found on the VPATH for an out-of-tree build so we
copy it over. See [1] for discussion.

[1] http://lists.openembedded.org/pipermail/openembedded-devel/2014-May/096052.html

v3: only create and populate po/ if it doesn't already exist

Signed-off-by: Ash Charles <ashcharles@gmail.com>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/eject/eject_2.1.5.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index c47c653..a71d83f 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -16,6 +16,12 @@ S = "${WORKDIR}/${BPN}"
 
 PR = "r1"
 
+do_compile_prepend() {
+    # PO subdir must be in build directory
+    mkdir -p ${B}/po
+    cp -r ${S}/po/* ${B}/po/
+}
+
 ALTERNATIVE_${PN} = "volname eject"
 ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
 ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
-- 
1.8.3.2

Re: [Patch v3] eject: copy po subdirectory for out-of-tree build

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 5143 bytes --]

On Tue, Jun 10, 2014 at 11:18:02AM -0700, Ash Charles wrote:
> The po subdirectory found on the VPATH for an out-of-tree build so we
> copy it over. See [1] for discussion.
> 
> [1] http://lists.openembedded.org/pipermail/openembedded-devel/2014-May/096052.html
> 
> v3: only create and populate po/ if it doesn't already exist

^ this doesn't match with patch and it still fails:

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/eject/2.1.5-r1/temp/log.do_compile.31092)
ERROR: Logfile of failure stored in: /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/temp/log.do_compile.31092
Log data follows:
| DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc', 'bit-64', 'x86_64-linux', 'common']
| DEBUG: Executing shell function do_compile
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/CVS' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/CVS' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/Makefile' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/Makefile' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/cs_CZ.po' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/cs_CZ.po' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/de_DE.po' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/de_DE.po' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/eject.pot' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/eject.pot' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/es_ES.po' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/es_ES.po' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/fr_FR.po' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/fr_FR.po' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/ja_JP.eucJP.po' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/ja_JP.eucJP.po' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/pt_BR.po' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/pt_BR.po' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/tr_TR.po' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/tr_TR.po' are the same file
| cp: `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/zh_TW.UTF-8.po' and `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/zh_TW.UTF-8.po' are the same file
| 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/eject/2.1.5-r1/temp/log.do_compile.31092)
NOTE: recipe eject-2.1.5-r1: task do_compile: Failed
ERROR: Task 21543 (/home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb, do_compile) failed with exit code '1'

> Signed-off-by: Ash Charles <ashcharles@gmail.com>
> Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-support/eject/eject_2.1.5.bb | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> index c47c653..a71d83f 100644
> --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
> +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> @@ -16,6 +16,12 @@ S = "${WORKDIR}/${BPN}"
>  
>  PR = "r1"
>  
> +do_compile_prepend() {
> +    # PO subdir must be in build directory
> +    mkdir -p ${B}/po
> +    cp -r ${S}/po/* ${B}/po/
> +}
> +
>  ALTERNATIVE_${PN} = "volname eject"
>  ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
>  ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
> -- 
> 1.8.3.2
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [Patch v3] eject: copy po subdirectory for out-of-tree build

[Ash Charles]

Any chance this is getting built with autotools-brokensep still in place?
On Jun 13, 2014 4:40 AM, "Martin Jansa" <martin.jansa@gmail.com> wrote:

> On Tue, Jun 10, 2014 at 11:18:02AM -0700, Ash Charles wrote:
> > The po subdirectory found on the VPATH for an out-of-tree build so we
> > copy it over. See [1] for discussion.
> >
> > [1]
> http://lists.openembedded.org/pipermail/openembedded-devel/2014-May/096052.html
> >
> > v3: only create and populate po/ if it doesn't already exist
>
> ^ this doesn't match with patch and it still fails:
>
> 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/eject/2.1.5-r1/temp/log.do_compile.31092)
> ERROR: Logfile of failure stored in:
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/temp/log.do_compile.31092
> Log data follows:
> | DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc',
> 'bit-64', 'x86_64-linux', 'common']
> | DEBUG: Executing shell function do_compile
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/CVS'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/CVS'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/Makefile'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/Makefile'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/cs_CZ.po'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/cs_CZ.po'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/de_DE.po'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/de_DE.po'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/eject.pot'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/eject.pot'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/es_ES.po'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/es_ES.po'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/fr_FR.po'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/fr_FR.po'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/ja_JP.eucJP.po'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/ja_JP.eucJP.po'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/pt_BR.po'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/pt_BR.po'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/tr_TR.po'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/tr_TR.po'
> are the same file
> | cp:
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/zh_TW.UTF-8.po'
> and
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/zh_TW.UTF-8.po'
> are the same file
> | 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/eject/2.1.5-r1/temp/log.do_compile.31092)
> NOTE: recipe eject-2.1.5-r1: task do_compile: Failed
> ERROR: Task 21543
> (/home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-oe/recipes-support/eject/
> eject_2.1.5.bb, do_compile) failed with exit code '1'
>
> > Signed-off-by: Ash Charles <ashcharles@gmail.com>
> > Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta-oe/recipes-support/eject/eject_2.1.5.bb | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb
> b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> > index c47c653..a71d83f 100644
> > --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
> > +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> > @@ -16,6 +16,12 @@ S = "${WORKDIR}/${BPN}"
> >
> >  PR = "r1"
> >
> > +do_compile_prepend() {
> > +    # PO subdir must be in build directory
> > +    mkdir -p ${B}/po
> > +    cp -r ${S}/po/* ${B}/po/
> > +}
> > +
> >  ALTERNATIVE_${PN} = "volname eject"
> >  ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
> >  ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
> > --
> > 1.8.3.2
> >
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>

Re: [Patch v3] eject: copy po subdirectory for out-of-tree build

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 6087 bytes --]

On Fri, Jun 13, 2014 at 06:57:54AM -0700, Ash Charles wrote:
> Any chance this is getting built with autotools-brokensep still in place?

Yes, that could be it, I'll remove eject from my big autotools-broken
sep, but can we make it compatible with B=S as well? That's what commit
message suggests.

> On Jun 13, 2014 4:40 AM, "Martin Jansa" <martin.jansa@gmail.com> wrote:
> 
> > On Tue, Jun 10, 2014 at 11:18:02AM -0700, Ash Charles wrote:
> > > The po subdirectory found on the VPATH for an out-of-tree build so we
> > > copy it over. See [1] for discussion.
> > >
> > > [1]
> > http://lists.openembedded.org/pipermail/openembedded-devel/2014-May/096052.html
> > >
> > > v3: only create and populate po/ if it doesn't already exist
> >
> > ^ this doesn't match with patch and it still fails:
> >
> > 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/eject/2.1.5-r1/temp/log.do_compile.31092)
> > ERROR: Logfile of failure stored in:
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/temp/log.do_compile.31092
> > Log data follows:
> > | DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc',
> > 'bit-64', 'x86_64-linux', 'common']
> > | DEBUG: Executing shell function do_compile
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/CVS'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/CVS'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/Makefile'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/Makefile'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/cs_CZ.po'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/cs_CZ.po'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/de_DE.po'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/de_DE.po'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/eject.pot'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/eject.pot'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/es_ES.po'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/es_ES.po'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/fr_FR.po'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/fr_FR.po'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/ja_JP.eucJP.po'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/ja_JP.eucJP.po'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/pt_BR.po'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/pt_BR.po'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/tr_TR.po'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/tr_TR.po'
> > are the same file
> > | cp:
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/zh_TW.UTF-8.po'
> > and
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/eject/2.1.5-r1/eject/po/zh_TW.UTF-8.po'
> > are the same file
> > | 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/eject/2.1.5-r1/temp/log.do_compile.31092)
> > NOTE: recipe eject-2.1.5-r1: task do_compile: Failed
> > ERROR: Task 21543
> > (/home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-oe/recipes-support/eject/
> > eject_2.1.5.bb, do_compile) failed with exit code '1'
> >
> > > Signed-off-by: Ash Charles <ashcharles@gmail.com>
> > > Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > >  meta-oe/recipes-support/eject/eject_2.1.5.bb | 6 ++++++
> > >  1 file changed, 6 insertions(+)
> > >
> > > diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb
> > b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> > > index c47c653..a71d83f 100644
> > > --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
> > > +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
> > > @@ -16,6 +16,12 @@ S = "${WORKDIR}/${BPN}"
> > >
> > >  PR = "r1"
> > >
> > > +do_compile_prepend() {
> > > +    # PO subdir must be in build directory
> > > +    mkdir -p ${B}/po
> > > +    cp -r ${S}/po/* ${B}/po/
> > > +}
> > > +
> > >  ALTERNATIVE_${PN} = "volname eject"
> > >  ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
> > >  ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
> > > --
> > > 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 --]

[Patch v4] eject: copy po subdirectory for out-of-tree build

[Ash Charles]

The po subdirectory found on the VPATH for an out-of-tree build so we
copy it over. See [1] for discussion.

[1] http://lists.openembedded.org/pipermail/openembedded-devel/2014-May/096052.html

v3: only create and populate po/ if it doesn't already exist
v4: test to see if we're building out-of-tree

Signed-off-by: Ash Charles <ashcharles@gmail.com>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/eject/eject_2.1.5.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index c47c653..9534577 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -16,6 +16,14 @@ S = "${WORKDIR}/${BPN}"
 
 PR = "r1"
 
+do_compile_prepend() {
+    # PO subdir must be in build directory
+    if [ ! ${S} = ${B} ]; then
+        mkdir -p ${B}/po
+        cp -r ${S}/po/* ${B}/po/
+    fi
+}
+
 ALTERNATIVE_${PN} = "volname eject"
 ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname"
 ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
-- 
1.8.3.2