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

[Martin Jansa]

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 at 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 at gmail.com>
> > > Reviewed-by: Otavio Salvador <otavio at ossystems.com.br>
> > > Signed-off-by: Martin Jansa <Martin.Jansa at 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 at gmail.com
> >

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20140613/0dfb6a7a/attachment-0002.sig>