* [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po
@ 2012-12-11 11:10 Martin Jansa
2012-12-11 11:10 ` Martin Jansa
0 siblings, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2012-12-11 11:10 UTC (permalink / raw)
To: openembedded-core
* some packages (e.g. uptime, cpu, forecasts, news from meta-efl)
don't have remove-potcdate.sin in po subdirectory, but Makefile.in.in
supplied by autotools.bbclass depends on it and fails without like this:
| make[3]: Entering directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po'
| make[3]: *** No rule to make target `remove-potcdate.sin', needed by `remove-potcdate.sed'. Stop.
| make[3]: Leaving directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po'
| make[2]: *** [uptime.pot] Error 2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/autotools.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index ca981ec..3154435 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -193,6 +193,7 @@ autotools_do_configure() {
cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
if [ -d ${S}/po/ ]; then
cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/
+ cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sin ${S}/po/
fi
for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do
for j in `find ${S} -name $i | grep -v aclocal-copy`; do
--
1.8.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po 2012-12-11 11:10 [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po Martin Jansa @ 2012-12-11 11:10 ` Martin Jansa 2012-12-12 1:50 ` Saul Wold 0 siblings, 1 reply; 10+ messages in thread From: Martin Jansa @ 2012-12-11 11:10 UTC (permalink / raw) To: openembedded-core * some packages (e.g. uptime, cpu, forecasts, news from meta-efl) don't have remove-potcdate.sin in po subdirectory, but Makefile.in.in supplied by autotools.bbclass depends on it and fails without like this: | make[3]: Entering directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' | make[3]: *** No rule to make target `remove-potcdate.sin', needed by `remove-potcdate.sed'. Stop. | make[3]: Leaving directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' | make[2]: *** [uptime.pot] Error 2 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/classes/autotools.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index ca981ec..3154435 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -193,6 +193,7 @@ autotools_do_configure() { cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/ if [ -d ${S}/po/ ]; then cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/ + cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sin ${S}/po/ fi for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do for j in `find ${S} -name $i | grep -v aclocal-copy`; do -- 1.8.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po 2012-12-11 11:10 ` Martin Jansa @ 2012-12-12 1:50 ` Saul Wold 2012-12-12 21:27 ` Martin Jansa 0 siblings, 1 reply; 10+ messages in thread From: Saul Wold @ 2012-12-12 1:50 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core On 12/11/2012 03:10 AM, Martin Jansa wrote: > * some packages (e.g. uptime, cpu, forecasts, news from meta-efl) > don't have remove-potcdate.sin in po subdirectory, but Makefile.in.in > supplied by autotools.bbclass depends on it and fails without like this: > | make[3]: Entering directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' > | make[3]: *** No rule to make target `remove-potcdate.sin', needed by `remove-potcdate.sed'. Stop. > | make[3]: Leaving directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' > | make[2]: *** [uptime.pot] Error 2 > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > meta/classes/autotools.bbclass | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass > index ca981ec..3154435 100644 > --- a/meta/classes/autotools.bbclass > +++ b/meta/classes/autotools.bbclass > @@ -193,6 +193,7 @@ autotools_do_configure() { > cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/ > if [ -d ${S}/po/ ]; then > cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/ > + cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sin ${S}/po/ > fi > for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do > for j in `find ${S} -name $i | grep -v aclocal-copy`; do > This patch seems to have an adverse affect on a number of other packages some how. I saw a number patch failures and configure failures with this patch. See the Autobuilder for examples. http://autobuilder.yoctoproject.org:8010/builders/nightly-x86/builds/830/steps/shell_29/logs/stdio Sau! ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po 2012-12-12 1:50 ` Saul Wold @ 2012-12-12 21:27 ` Martin Jansa 2012-12-12 22:33 ` [PATCHv2 1/2] " Martin Jansa 2012-12-13 8:03 ` [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po Saul Wold 0 siblings, 2 replies; 10+ messages in thread From: Martin Jansa @ 2012-12-12 21:27 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 4314 bytes --] On Tue, Dec 11, 2012 at 05:50:01PM -0800, Saul Wold wrote: > On 12/11/2012 03:10 AM, Martin Jansa wrote: > > * some packages (e.g. uptime, cpu, forecasts, news from meta-efl) > > don't have remove-potcdate.sin in po subdirectory, but Makefile.in.in > > supplied by autotools.bbclass depends on it and fails without like this: > > | make[3]: Entering directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' > > | make[3]: *** No rule to make target `remove-potcdate.sin', needed by `remove-potcdate.sed'. Stop. > > | make[3]: Leaving directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' > > | make[2]: *** [uptime.pot] Error 2 > > > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > > --- > > meta/classes/autotools.bbclass | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass > > index ca981ec..3154435 100644 > > --- a/meta/classes/autotools.bbclass > > +++ b/meta/classes/autotools.bbclass > > @@ -193,6 +193,7 @@ autotools_do_configure() { > > cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/ > > if [ -d ${S}/po/ ]; then > > cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/ > > + cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sin ${S}/po/ > > fi > > for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do > > for j in `find ${S} -name $i | grep -v aclocal-copy`; do > > > This patch seems to have an adverse affect on a number of other packages > some how. I saw a number patch failures and configure failures with this > patch. > > See the Autobuilder for examples. > > http://autobuilder.yoctoproject.org:8010/builders/nightly-x86/builds/830/steps/shell_29/logs/stdio I got only one error caused by this in whole world build (with 19 layers) and that was in bash: NOTE: Running task 4203 of 22403 (ID: 11399, /OE/jansa-test/shr-core/openembedded-core/meta/recipes-extended/bash/bash_4.2.bb, do_configure) NOTE: recipe bash-4.2-r6: task do_configure: Started ERROR: Function failed: do_configure (see /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/temp/log.do_configure.4923 for further information) ERROR: Logfile of failure stored in: /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/temp/log.do_configure.4923 Log data follows: | DEBUG: Executing python function sysroot_cleansstate | DEBUG: Python function sysroot_cleansstate finished | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] | DEBUG: Executing shell function autotools_preconfigure | DEBUG: Shell function autotools_preconfigure finished | DEBUG: Executing shell function do_configure | automake (GNU automake) 1.12.5 | Copyright (C) 2012 Free Software Foundation, Inc. | License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl-2.0.html> | This is free software: you are free to change and redistribute it. | There is NO WARRANTY, to the extent permitted by law. | | Written by Tom Tromey <tromey@redhat.com> | and Alexandre Duret-Lutz <adl@gnu.org>. | AUTOV is 1.12 | cp: cannot create regular file '/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin': Permission denied | ERROR: Function failed: do_configure (see /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/temp/log.do_configure.4923 for further information) NOTE: recipe bash-4.2-r6: task do_configure: Failed $ ls -lah /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin -r--r--r-- 1 bitbake bitbake 432 Dec 9 2003 /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin This can be fixed in bash itself or I can add if to copy remove-potcdate.sin only if it doesn't exist. Cheers, -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCHv2 1/2] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po 2012-12-12 21:27 ` Martin Jansa @ 2012-12-12 22:33 ` Martin Jansa 2012-12-12 22:33 ` [PATCH 2/2] gettext: move remove-potcdate.sin from gettext-native to gettext-minimal-native Martin Jansa 2012-12-13 8:03 ` [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po Saul Wold 1 sibling, 1 reply; 10+ messages in thread From: Martin Jansa @ 2012-12-12 22:33 UTC (permalink / raw) To: openembedded-core * some packages (e.g. uptime, cpu, forecasts, news from meta-efl) don't have remove-potcdate.sin in po subdirectory, but Makefile.in.in supplied by autotools.bbclass depends on it and fails without like this: | make[3]: Entering directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' | make[3]: *** No rule to make target `remove-potcdate.sin', needed by `remove-potcdate.sed'. Stop. | make[3]: Leaving directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' | make[2]: *** [uptime.pot] Error 2 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- v2: added if to test existence of that file, because bash has it with wrong permissions -r--r--r-- 1 bitbake bitbake 432 Dec 9 2003 ../work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin meta/classes/autotools.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index ca981ec..9d1a299 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -193,6 +193,9 @@ autotools_do_configure() { cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/ if [ -d ${S}/po/ ]; then cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/ + if [ ! -e ${S}/po/remove-potcdate.sin ]; then + cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sin ${S}/po/ + fi fi for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do for j in `find ${S} -name $i | grep -v aclocal-copy`; do -- 1.8.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/2] gettext: move remove-potcdate.sin from gettext-native to gettext-minimal-native 2012-12-12 22:33 ` [PATCHv2 1/2] " Martin Jansa @ 2012-12-12 22:33 ` Martin Jansa 2012-12-12 23:28 ` Saul Wold 0 siblings, 1 reply; 10+ messages in thread From: Martin Jansa @ 2012-12-12 22:33 UTC (permalink / raw) To: openembedded-core Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../gettext-minimal-0.18.1.1/remove-potcdate.sin | 19 +++++++++++++++++++ .../gettext/gettext-minimal-native_0.18.1.1.bb | 4 +++- meta/recipes-core/gettext/gettext_0.18.1.1.bb | 3 ++- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin new file mode 100644 index 0000000..2436c49 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin @@ -0,0 +1,19 @@ +# Sed script that remove the POT-Creation-Date line in the header entry +# from a POT file. +# +# The distinction between the first and the following occurrences of the +# pattern is achieved by looking at the hold space. +/^"POT-Creation-Date: .*"$/{ +x +# Test if the hold space is empty. +s/P/P/ +ta +# Yes it was empty. First occurrence. Remove the line. +g +d +bb +:a +# The hold space was nonempty. Following occurrences. Do nothing. +x +:b +} diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb index a46a40d..f008a79 100644 --- a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb @@ -1,6 +1,7 @@ SRC_URI = "file://aclocal.tgz \ file://config.rpath \ file://Makefile.in.in \ + file://remove-potcdate.sin \ file://COPYING" INHIBIT_DEFAULT_DEPS = "1" @@ -11,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5" inherit native -PR = "r4" +PR = "r5" S = "${WORKDIR}" @@ -21,4 +22,5 @@ do_install () { install -d ${D}${datadir}/gettext/po/ cp ${WORKDIR}/config.rpath ${D}${datadir}/gettext/ cp ${WORKDIR}/Makefile.in.in ${D}${datadir}/gettext/po/ + cp ${WORKDIR}/remove-potcdate.sin ${D}${datadir}/gettext/po/ } diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index c3265e1..4639481 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "GPLv3+ & LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PR = "r18" +PR = "r19" DEPENDS = "gettext-native virtual/libiconv ncurses expat" DEPENDS_class-native = "gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" @@ -104,6 +104,7 @@ do_install_append_class-native () { rm ${D}${datadir}/aclocal/* rm ${D}${datadir}/gettext/config.rpath rm ${D}${datadir}/gettext/po/Makefile.in.in + rm ${D}${datadir}/gettext/po/remove-potcdate.sin } BBCLASSEXTEND = "native nativesdk" -- 1.8.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] gettext: move remove-potcdate.sin from gettext-native to gettext-minimal-native 2012-12-12 22:33 ` [PATCH 2/2] gettext: move remove-potcdate.sin from gettext-native to gettext-minimal-native Martin Jansa @ 2012-12-12 23:28 ` Saul Wold 2012-12-12 23:48 ` [PATCHv2 " Martin Jansa 0 siblings, 1 reply; 10+ messages in thread From: Saul Wold @ 2012-12-12 23:28 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core On 12/12/2012 02:33 PM, Martin Jansa wrote: A little more on my this is needed please. Sau! > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > .../gettext-minimal-0.18.1.1/remove-potcdate.sin | 19 +++++++++++++++++++ > .../gettext/gettext-minimal-native_0.18.1.1.bb | 4 +++- > meta/recipes-core/gettext/gettext_0.18.1.1.bb | 3 ++- > 3 files changed, 24 insertions(+), 2 deletions(-) > create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin > > diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin > new file mode 100644 > index 0000000..2436c49 > --- /dev/null > +++ b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin > @@ -0,0 +1,19 @@ > +# Sed script that remove the POT-Creation-Date line in the header entry > +# from a POT file. > +# > +# The distinction between the first and the following occurrences of the > +# pattern is achieved by looking at the hold space. > +/^"POT-Creation-Date: .*"$/{ > +x > +# Test if the hold space is empty. > +s/P/P/ > +ta > +# Yes it was empty. First occurrence. Remove the line. > +g > +d > +bb > +:a > +# The hold space was nonempty. Following occurrences. Do nothing. > +x > +:b > +} > diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb > index a46a40d..f008a79 100644 > --- a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb > +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb > @@ -1,6 +1,7 @@ > SRC_URI = "file://aclocal.tgz \ > file://config.rpath \ > file://Makefile.in.in \ > + file://remove-potcdate.sin \ > file://COPYING" > > INHIBIT_DEFAULT_DEPS = "1" > @@ -11,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5" > > inherit native > > -PR = "r4" > +PR = "r5" > > S = "${WORKDIR}" > > @@ -21,4 +22,5 @@ do_install () { > install -d ${D}${datadir}/gettext/po/ > cp ${WORKDIR}/config.rpath ${D}${datadir}/gettext/ > cp ${WORKDIR}/Makefile.in.in ${D}${datadir}/gettext/po/ > + cp ${WORKDIR}/remove-potcdate.sin ${D}${datadir}/gettext/po/ > } > diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb > index c3265e1..4639481 100644 > --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb > +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb > @@ -5,7 +5,7 @@ SECTION = "libs" > LICENSE = "GPLv3+ & LGPL-2.1+" > LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > -PR = "r18" > +PR = "r19" > DEPENDS = "gettext-native virtual/libiconv ncurses expat" > DEPENDS_class-native = "gettext-minimal-native" > PROVIDES = "virtual/libintl virtual/gettext" > @@ -104,6 +104,7 @@ do_install_append_class-native () { > rm ${D}${datadir}/aclocal/* > rm ${D}${datadir}/gettext/config.rpath > rm ${D}${datadir}/gettext/po/Makefile.in.in > + rm ${D}${datadir}/gettext/po/remove-potcdate.sin > } > > BBCLASSEXTEND = "native nativesdk" > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCHv2 2/2] gettext: move remove-potcdate.sin from gettext-native to gettext-minimal-native 2012-12-12 23:28 ` Saul Wold @ 2012-12-12 23:48 ` Martin Jansa 2012-12-13 18:14 ` Martin Jansa 0 siblings, 1 reply; 10+ messages in thread From: Martin Jansa @ 2012-12-12 23:48 UTC (permalink / raw) To: openembedded-core * now autotools.bbclass are copying not only Makefile.in.in but also remove-potcdate.sin which is used by Makefile.in.in, so we need to provide this file already in gettext-minimal-native otherwise build can fail, when autotools.bbclass is used before gettext-native (full) is built. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- v2: only commit message .../gettext-minimal-0.18.1.1/remove-potcdate.sin | 19 +++++++++++++++++++ .../gettext/gettext-minimal-native_0.18.1.1.bb | 4 +++- meta/recipes-core/gettext/gettext_0.18.1.1.bb | 3 ++- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin new file mode 100644 index 0000000..2436c49 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin @@ -0,0 +1,19 @@ +# Sed script that remove the POT-Creation-Date line in the header entry +# from a POT file. +# +# The distinction between the first and the following occurrences of the +# pattern is achieved by looking at the hold space. +/^"POT-Creation-Date: .*"$/{ +x +# Test if the hold space is empty. +s/P/P/ +ta +# Yes it was empty. First occurrence. Remove the line. +g +d +bb +:a +# The hold space was nonempty. Following occurrences. Do nothing. +x +:b +} diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb index a46a40d..f008a79 100644 --- a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb @@ -1,6 +1,7 @@ SRC_URI = "file://aclocal.tgz \ file://config.rpath \ file://Makefile.in.in \ + file://remove-potcdate.sin \ file://COPYING" INHIBIT_DEFAULT_DEPS = "1" @@ -11,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5" inherit native -PR = "r4" +PR = "r5" S = "${WORKDIR}" @@ -21,4 +22,5 @@ do_install () { install -d ${D}${datadir}/gettext/po/ cp ${WORKDIR}/config.rpath ${D}${datadir}/gettext/ cp ${WORKDIR}/Makefile.in.in ${D}${datadir}/gettext/po/ + cp ${WORKDIR}/remove-potcdate.sin ${D}${datadir}/gettext/po/ } diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index c3265e1..4639481 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "GPLv3+ & LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PR = "r18" +PR = "r19" DEPENDS = "gettext-native virtual/libiconv ncurses expat" DEPENDS_class-native = "gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" @@ -104,6 +104,7 @@ do_install_append_class-native () { rm ${D}${datadir}/aclocal/* rm ${D}${datadir}/gettext/config.rpath rm ${D}${datadir}/gettext/po/Makefile.in.in + rm ${D}${datadir}/gettext/po/remove-potcdate.sin } BBCLASSEXTEND = "native nativesdk" -- 1.8.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCHv2 2/2] gettext: move remove-potcdate.sin from gettext-native to gettext-minimal-native 2012-12-12 23:48 ` [PATCHv2 " Martin Jansa @ 2012-12-13 18:14 ` Martin Jansa 0 siblings, 0 replies; 10+ messages in thread From: Martin Jansa @ 2012-12-13 18:14 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 4762 bytes --] On Thu, Dec 13, 2012 at 12:48:40AM +0100, Martin Jansa wrote: > * now autotools.bbclass are copying not only Makefile.in.in but also > remove-potcdate.sin which is used by Makefile.in.in, so we need to > provide this file already in gettext-minimal-native otherwise build > can fail, when autotools.bbclass is used before gettext-native (full) > is built. > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > > v2: only commit message Please be aware that this needs one manual step. clean gettext-native before upgrading gettext-minimal-native or clean gettext-minimal-native after gettext-native was rebuilt Without this manual step it will cause missing remove-potcdate.sin in native sysroot, because 1) gettext-minimal-native_0.18.1.1.bb installs it with warning: WARNING: The recipe gettext-minimal-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are: /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/gettext/po/remove-potcdate.sin Matched in manifest-x86_64-gettext-native Please verify which package should provide the above files. 2) building gettext-native will clean its own sstate data from sysroot including remove-potcdate.sin because it was part of gettext-native before, then installs without error, but also without remove-potcdate.sin It's the same problem as with config.rpath before: http://lists.linuxtogo.org/pipermail/openembedded-core/2012-October/031120.html Cheers, > > .../gettext-minimal-0.18.1.1/remove-potcdate.sin | 19 +++++++++++++++++++ > .../gettext/gettext-minimal-native_0.18.1.1.bb | 4 +++- > meta/recipes-core/gettext/gettext_0.18.1.1.bb | 3 ++- > 3 files changed, 24 insertions(+), 2 deletions(-) > create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin > > diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin > new file mode 100644 > index 0000000..2436c49 > --- /dev/null > +++ b/meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin > @@ -0,0 +1,19 @@ > +# Sed script that remove the POT-Creation-Date line in the header entry > +# from a POT file. > +# > +# The distinction between the first and the following occurrences of the > +# pattern is achieved by looking at the hold space. > +/^"POT-Creation-Date: .*"$/{ > +x > +# Test if the hold space is empty. > +s/P/P/ > +ta > +# Yes it was empty. First occurrence. Remove the line. > +g > +d > +bb > +:a > +# The hold space was nonempty. Following occurrences. Do nothing. > +x > +:b > +} > diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb > index a46a40d..f008a79 100644 > --- a/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb > +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb > @@ -1,6 +1,7 @@ > SRC_URI = "file://aclocal.tgz \ > file://config.rpath \ > file://Makefile.in.in \ > + file://remove-potcdate.sin \ > file://COPYING" > > INHIBIT_DEFAULT_DEPS = "1" > @@ -11,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5" > > inherit native > > -PR = "r4" > +PR = "r5" > > S = "${WORKDIR}" > > @@ -21,4 +22,5 @@ do_install () { > install -d ${D}${datadir}/gettext/po/ > cp ${WORKDIR}/config.rpath ${D}${datadir}/gettext/ > cp ${WORKDIR}/Makefile.in.in ${D}${datadir}/gettext/po/ > + cp ${WORKDIR}/remove-potcdate.sin ${D}${datadir}/gettext/po/ > } > diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb > index c3265e1..4639481 100644 > --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb > +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb > @@ -5,7 +5,7 @@ SECTION = "libs" > LICENSE = "GPLv3+ & LGPL-2.1+" > LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > -PR = "r18" > +PR = "r19" > DEPENDS = "gettext-native virtual/libiconv ncurses expat" > DEPENDS_class-native = "gettext-minimal-native" > PROVIDES = "virtual/libintl virtual/gettext" > @@ -104,6 +104,7 @@ do_install_append_class-native () { > rm ${D}${datadir}/aclocal/* > rm ${D}${datadir}/gettext/config.rpath > rm ${D}${datadir}/gettext/po/Makefile.in.in > + rm ${D}${datadir}/gettext/po/remove-potcdate.sin > } > > BBCLASSEXTEND = "native nativesdk" > -- > 1.8.0 > -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po 2012-12-12 21:27 ` Martin Jansa 2012-12-12 22:33 ` [PATCHv2 1/2] " Martin Jansa @ 2012-12-13 8:03 ` Saul Wold 1 sibling, 0 replies; 10+ messages in thread From: Saul Wold @ 2012-12-13 8:03 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core On 12/12/2012 01:27 PM, Martin Jansa wrote: > On Tue, Dec 11, 2012 at 05:50:01PM -0800, Saul Wold wrote: >> On 12/11/2012 03:10 AM, Martin Jansa wrote: >>> * some packages (e.g. uptime, cpu, forecasts, news from meta-efl) >>> don't have remove-potcdate.sin in po subdirectory, but Makefile.in.in >>> supplied by autotools.bbclass depends on it and fails without like this: >>> | make[3]: Entering directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' >>> | make[3]: *** No rule to make target `remove-potcdate.sin', needed by `remove-potcdate.sed'. Stop. >>> | make[3]: Leaving directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' >>> | make[2]: *** [uptime.pot] Error 2 >>> >>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >>> --- >>> meta/classes/autotools.bbclass | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass >>> index ca981ec..3154435 100644 >>> --- a/meta/classes/autotools.bbclass >>> +++ b/meta/classes/autotools.bbclass >>> @@ -193,6 +193,7 @@ autotools_do_configure() { >>> cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/ >>> if [ -d ${S}/po/ ]; then >>> cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/ >>> + cp ${STAGING_DATADIR_NATIVE}/gettext/po/reOn 12/12/2012 01:27 PM, Martin Jansa wrote:> On Tue, Dec 11, 2012 at 05:50:01PM -0800, Saul Wold wrote: >> On 12/11/2012 03:10 AM, Martin Jansa wrote: >>> * some packages (e.g. uptime, cpu, forecasts, news from meta-efl) >>> don't have remove-potcdate.sin in po subdirectory, but Makefile.in.in >>> supplied by autotools.bbclass depends on it and fails without like this: >>> | make[3]: Entering directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' >>> | make[3]: *** No rule to make target `remove-potcdate.sin', needed by `remove-potcdate.sed'. Stop. >>> | make[3]: Leaving directory `/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/uptime/0.0.2+svnr80477-r0.0/E-MODULES-EXTRA/uptime/po' >>> | make[2]: *** [uptime.pot] Error 2 >>> >>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >>> --- >>> meta/classes/autotools.bbclass | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass >>> index ca981ec..3154435 100644 >>> --- a/meta/classes/autotools.bbclass >>> +++ b/meta/classes/autotools.bbclass >>> @@ -193,6 +193,7 @@ autotools_do_configure() { >>> cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/ >>> if [ -d ${S}/po/ ]; then >>> cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/ >>> + cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sin ${S}/po/ >>> fi >>> for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do >>> for j in `find ${S} -name $i | grep -v aclocal-copy`; do >>> >> This patch seems to have an adverse affect on a number of other packages >> some how. I saw a number patch failures and configure failures with this >> patch. >> >> See the Autobuilder for examples. >> >> http://autobuilder.yoctoproject.org:8010/builders/nightly-x86/builds/830/steps/shell_29/logs/stdio > > I got only one error caused by this in whole world build (with 19 > layers) and that was in bash: > > NOTE: Running task 4203 of 22403 (ID: 11399, /OE/jansa-test/shr-core/openembedded-core/meta/recipes-extended/bash/bash_4.2.bb, do_configure) > NOTE: recipe bash-4.2-r6: task do_configure: Started > ERROR: Function failed: do_configure (see /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/temp/log.do_configure.4923 for > further information) > ERROR: Logfile of failure stored in: /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/temp/log.do_configure.4923 > Log data follows: > | DEBUG: Executing python function sysroot_cleansstate > | DEBUG: Python function sysroot_cleansstate finished > | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] > | DEBUG: Executing shell function autotools_preconfigure > | DEBUG: Shell function autotools_preconfigure finished > | DEBUG: Executing shell function do_configure > | automake (GNU automake) 1.12.5 > | Copyright (C) 2012 Free Software Foundation, Inc. > | License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl-2.0.html> > | This is free software: you are free to change and redistribute it. > | There is NO WARRANTY, to the extent permitted by law. > | > | Written by Tom Tromey <tromey@redhat.com> > | and Alexandre Duret-Lutz <adl@gnu.org>. > | AUTOV is 1.12 > | cp: cannot create regular file '/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin': Permission denied > | ERROR: Function failed: do_configure (see /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/temp/log.do_configure.4923 for further information) > NOTE: recipe bash-4.2-r6: task do_configure: Failed > > $ ls -lah /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin > -r--r--r-- 1 bitbake bitbake 432 Dec 9 2003 /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin > > This can be fixed in bash itself or I can add if to copy remove-potcdate.sin only if it doesn't exist. > This still seems to be problem, I thought you fixed this with the latest verion. See > http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64/builds/756/steps/shell_56/logs/stdio Sau! > Cheers, >move-potcdate.sin ${S}/po/ >>> fi >>> for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do >>> for j in `find ${S} -name $i | grep -v aclocal-copy`; do >>> >> This patch seems to have an adverse affect on a number of other packages >> some how. I saw a number patch failures and configure failures with this >> patch. >> >> See the Autobuilder for examples. >> >> http://autobuilder.yoctoproject.org:8010/builders/nightly-x86/builds/830/steps/shell_29/logs/stdio > > I got only one error caused by this in whole world build (with 19 > layers) and that was in bash: > > NOTE: Running task 4203 of 22403 (ID: 11399, /OE/jansa-test/shr-core/openembedded-core/meta/recipes-extended/bash/bash_4.2.bb, do_configure) > NOTE: recipe bash-4.2-r6: task do_configure: Started > ERROR: Function failed: do_configure (see /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/temp/log.do_configure.4923 for > further information) > ERROR: Logfile of failure stored in: /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/temp/log.do_configure.4923 > Log data follows: > | DEBUG: Executing python function sysroot_cleansstate > | DEBUG: Python function sysroot_cleansstate finished > | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] > | DEBUG: Executing shell function autotools_preconfigure > | DEBUG: Shell function autotools_preconfigure finished > | DEBUG: Executing shell function do_configure > | automake (GNU automake) 1.12.5 > | Copyright (C) 2012 Free Software Foundation, Inc. > | License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl-2.0.html> > | This is free software: you are free to change and redistribute it. > | There is NO WARRANTY, to the extent permitted by law. > | > | Written by Tom Tromey <tromey@redhat.com> > | and Alexandre Duret-Lutz <adl@gnu.org>. > | AUTOV is 1.12 > | cp: cannot create regular file '/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin': Permission denied > | ERROR: Function failed: do_configure (see /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/temp/log.do_configure.4923 for further information) > NOTE: recipe bash-4.2-r6: task do_configure: Failed > > $ ls -lah /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin > -r--r--r-- 1 bitbake bitbake 432 Dec 9 2003 /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/bash/4.2-r6/bash-4.2/po/remove-potcdate.sin > > This can be fixed in bash itself or I can add if to copy remove-potcdate.sin only if it doesn't exist. > > Cheers, > ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-12-13 18:29 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-11 11:10 [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po Martin Jansa
2012-12-11 11:10 ` Martin Jansa
2012-12-12 1:50 ` Saul Wold
2012-12-12 21:27 ` Martin Jansa
2012-12-12 22:33 ` [PATCHv2 1/2] " Martin Jansa
2012-12-12 22:33 ` [PATCH 2/2] gettext: move remove-potcdate.sin from gettext-native to gettext-minimal-native Martin Jansa
2012-12-12 23:28 ` Saul Wold
2012-12-12 23:48 ` [PATCHv2 " Martin Jansa
2012-12-13 18:14 ` Martin Jansa
2012-12-13 8:03 ` [PATCH] autotools: copy also remove-potcdate.sin from ${STAGING_DATADIR_NATIVE}/gettext/po Saul Wold
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.