| Submitter | Gary Thomas |
|---|---|
| Date | Nov. 29, 2012, 1:06 p.m. |
| Message ID | <1354194369-17500-1-git-send-email-gary@mlbassoc.com> |
| Download | mbox | patch |
| Permalink | /patch/39875/ |
| State | Accepted |
| Commit | 4f5e5e28aa57b931ed297d08756a76bbcd8258f1 |
| Headers | show |
Comments
On Thu, Nov 29, 2012 at 06:06:09AM -0700, Gary Thomas wrote: > Not all gstreamer plugins have localized documentation trees. This change looks good, just curious, which plugins recipe does not have po subdirectory? Something outside oe-core? Because all 4 included in oe-core worked fine: meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb:require gst-plugins.inc meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb:require gst-plugins.inc meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb:require gst-plugins.inc meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb:require gst-plugins.inc Cheers, > > The commit > commit f50e2984d9411a059b86d6c158e9416fceb84c3d > Author: Martin Jansa <martin.jansa@gmail.com> > Date: Wed Nov 28 15:59:48 2012 +0100 > breaks the build for such packages because the file "po/Makefile.in.in" > is not present. > > This change allows building without the po/ subdirectory. > > Signed-off-by: Gary Thomas <gary@mlbassoc.com> > --- > meta/recipes-multimedia/gstreamer/gst-plugins.inc | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc > index 07b26a3..fc9567a 100644 > --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc > +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc > @@ -23,5 +23,7 @@ PACKAGES_DYNAMIC += "^${PN}-.*" > # ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed > # http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html > oe_runconf_prepend() { > - sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in > + if [ -e ${S}/po/Makefile.in.in ]; then > + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in > + fi > } > -- > 1.7.9.5 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On 2012-11-29 06:26, Martin Jansa wrote: > On Thu, Nov 29, 2012 at 06:06:09AM -0700, Gary Thomas wrote: >> Not all gstreamer plugins have localized documentation trees. > > This change looks good, just curious, which plugins recipe does not have > po subdirectory? > > Something outside oe-core? Because all 4 included in oe-core worked fine: > meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb:require gst-plugins.inc > meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb:require gst-plugins.inc > meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb:require gst-plugins.inc > meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb:require gst-plugins.inc Yes, this is for a plugin I'm working on for meta-ti (gst-plugin-ducati) >> >> The commit >> commit f50e2984d9411a059b86d6c158e9416fceb84c3d >> Author: Martin Jansa <martin.jansa@gmail.com> >> Date: Wed Nov 28 15:59:48 2012 +0100 >> breaks the build for such packages because the file "po/Makefile.in.in" >> is not present. >> >> This change allows building without the po/ subdirectory. >> >> Signed-off-by: Gary Thomas <gary@mlbassoc.com> >> --- >> meta/recipes-multimedia/gstreamer/gst-plugins.inc | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc >> index 07b26a3..fc9567a 100644 >> --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc >> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc >> @@ -23,5 +23,7 @@ PACKAGES_DYNAMIC += "^${PN}-.*" >> # ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed >> # http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html >> oe_runconf_prepend() { >> - sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in >> + if [ -e ${S}/po/Makefile.in.in ]; then >> + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in >> + fi >> } >> -- >> 1.7.9.5 >> >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
Patch
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc index 07b26a3..fc9567a 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc @@ -23,5 +23,7 @@ PACKAGES_DYNAMIC += "^${PN}-.*" # ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed # http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html oe_runconf_prepend() { - sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in + if [ -e ${S}/po/Makefile.in.in ]; then + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in + fi }
Not all gstreamer plugins have localized documentation trees. The commit commit f50e2984d9411a059b86d6c158e9416fceb84c3d Author: Martin Jansa <martin.jansa@gmail.com> Date: Wed Nov 28 15:59:48 2012 +0100 breaks the build for such packages because the file "po/Makefile.in.in" is not present. This change allows building without the po/ subdirectory. Signed-off-by: Gary Thomas <gary@mlbassoc.com> --- meta/recipes-multimedia/gstreamer/gst-plugins.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)