| Submitter | Cristian Iorga |
|---|---|
| Date | June 1, 2012, 7:52 a.m. |
| Message ID | <1338537158-19917-1-git-send-email-cristian.iorga@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/29059/ |
| State | New |
| Headers | show |
Comments
On Fri, Jun 1, 2012 at 12:52 AM, Cristian Iorga <cristian.iorga@intel.com> wrote: > ltp makefile does not interpret correctly the result of git describe > command and assumes that it is working with a git repo, while in fact > working with a source code archive. > Added a patch to corect makefile system. > > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> > --- > .../ltp/ltp/fix_building_fom_archive.patch | 23 ++++++++++++++++++++ > meta/recipes-extended/ltp/ltp_20120401.bb | 4 ++-- > 2 files changed, 25 insertions(+), 2 deletions(-) > create mode 100644 meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch > > diff --git a/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch > new file mode 100644 > index 0000000..c0ecc86 > --- /dev/null > +++ b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch > @@ -0,0 +1,23 @@ > +ltp package build system is broken if building from archive > + > +ltp makefile does not interpret correctly the result of git describe > +command and assumes that it is working with a git repo, while in fact > +working with a source code archive. > + > +Upstream-Status: Pending > +Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> > + > +Index: ltp-20120401/Makefile > +=================================================================== > +--- ltp-20120401.orig/Makefile > ++++ ltp-20120401/Makefile > +@@ -173,7 +173,8 @@ SRCDIR_INSTALL_TARGETS := $(SRCDIR_INSTA > + # > + .PHONY: Version > + Version: > +- if git describe &> /dev/null; then \ > ++ git describe &> /dev/null > ++ if [ $? -eq 0 ]; then \ > + git describe > "$@"; \ > + else \ > + cp VERSION "$@"; \ > diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb b/meta/recipes-extended/ltp/ltp_20120401.bb > index 912d6d9..563bd58 100644 > --- a/meta/recipes-extended/ltp/ltp_20120401.bb > +++ b/meta/recipes-extended/ltp/ltp_20120401.bb > @@ -21,10 +21,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ > > DEPENDS = "attr" > > -PR = "r3" > +PR = "r4" > > SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ > - " > + file://fix_building_fom_archive.patch" > > SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d" > SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1" > -- > 1.7.9.5 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core This patch seems to be causing build failures: | ERROR: Function failed: do_compile (see /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/temp/log.do_compile.695 for further information) | NOTE: make -j 16 | make -C "lib" \ | -f "/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib/Makefile" all | git describe &> /dev/null | make: *** [Version] Error 128 | make: *** Waiting for unfinished jobs.... | make[1]: Entering directory `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' | make[1]: Nothing to be done for `all'. | make[1]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' | ERROR: oe_runmake failed -b
Confirmed. @g On Sat, Jun 2, 2012 at 7:59 PM, Flanagan, Elizabeth < elizabeth.flanagan@intel.com> wrote: > On Fri, Jun 1, 2012 at 12:52 AM, Cristian Iorga > <cristian.iorga@intel.com> wrote: > > ltp makefile does not interpret correctly the result of git describe > > command and assumes that it is working with a git repo, while in fact > > working with a source code archive. > > Added a patch to corect makefile system. > > > > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> > > --- > > .../ltp/ltp/fix_building_fom_archive.patch | 23 > ++++++++++++++++++++ > > meta/recipes-extended/ltp/ltp_20120401.bb | 4 ++-- > > 2 files changed, 25 insertions(+), 2 deletions(-) > > create mode 100644 > meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch > > > > diff --git > a/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch > b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch > > new file mode 100644 > > index 0000000..c0ecc86 > > --- /dev/null > > +++ b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch > > @@ -0,0 +1,23 @@ > > +ltp package build system is broken if building from archive > > + > > +ltp makefile does not interpret correctly the result of git describe > > +command and assumes that it is working with a git repo, while in fact > > +working with a source code archive. > > + > > +Upstream-Status: Pending > > +Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> > > + > > +Index: ltp-20120401/Makefile > > +=================================================================== > > +--- ltp-20120401.orig/Makefile > > ++++ ltp-20120401/Makefile > > +@@ -173,7 +173,8 @@ SRCDIR_INSTALL_TARGETS := $(SRCDIR_INSTA > > + # > > + .PHONY: Version > > + Version: > > +- if git describe &> /dev/null; then \ > > ++ git describe &> /dev/null > > ++ if [ $? -eq 0 ]; then \ > > + git describe > "$@"; \ > > + else \ > > + cp VERSION "$@"; \ > > diff --git a/meta/recipes-extended/ltp/ltp_20120401.bbb/meta/recipes-extended/ltp/ > ltp_20120401.bb > > index 912d6d9..563bd58 100644 > > --- a/meta/recipes-extended/ltp/ltp_20120401.bb > > +++ b/meta/recipes-extended/ltp/ltp_20120401.bb > > @@ -21,10 +21,10 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ > > > > DEPENDS = "attr" > > > > -PR = "r3" > > +PR = "r4" > > > > SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ > > - " > > + file://fix_building_fom_archive.patch" > > > > SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d" > > SRC_URI[sha256sum] = > "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1" > > -- > > 1.7.9.5 > > > > > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > This patch seems to be causing build failures: > > | ERROR: Function failed: do_compile (see > > /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/temp/log.do_compile.695 > for further information) > | NOTE: make -j 16 > | make -C "lib" \ > | -f > "/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib/Makefile" > all > | git describe &> /dev/null > | make: *** [Version] Error 128 > | make: *** Waiting for unfinished jobs.... > | make[1]: Entering directory > > `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' > | make[1]: Nothing to be done for `all'. > | make[1]: Leaving directory > > `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' > | ERROR: oe_runmake failed > > > > -b > > -- > Elizabeth Flanagan > Yocto Project > Build and Release > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
On 06/02/2012 09:59 AM, Flanagan, Elizabeth wrote: > On Fri, Jun 1, 2012 at 12:52 AM, Cristian Iorga > <cristian.iorga@intel.com> wrote: >> ltp makefile does not interpret correctly the result of git describe >> command and assumes that it is working with a git repo, while in fact >> working with a source code archive. >> Added a patch to corect makefile system. >> >> Signed-off-by: Cristian Iorga<cristian.iorga@intel.com> >> --- >> .../ltp/ltp/fix_building_fom_archive.patch | 23 ++++++++++++++++++++ >> meta/recipes-extended/ltp/ltp_20120401.bb | 4 ++-- >> 2 files changed, 25 insertions(+), 2 deletions(-) >> create mode 100644 meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> >> diff --git a/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> new file mode 100644 >> index 0000000..c0ecc86 >> --- /dev/null >> +++ b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> @@ -0,0 +1,23 @@ >> +ltp package build system is broken if building from archive >> + >> +ltp makefile does not interpret correctly the result of git describe >> +command and assumes that it is working with a git repo, while in fact >> +working with a source code archive. >> + >> +Upstream-Status: Pending >> +Signed-off-by: Cristian Iorga<cristian.iorga@intel.com> >> + >> +Index: ltp-20120401/Makefile >> +=================================================================== >> +--- ltp-20120401.orig/Makefile >> ++++ ltp-20120401/Makefile >> +@@ -173,7 +173,8 @@ SRCDIR_INSTALL_TARGETS := $(SRCDIR_INSTA >> + # >> + .PHONY: Version >> + Version: >> +- if git describe&> /dev/null; then \ >> ++ git describe&> /dev/null >> ++ if [ $? -eq 0 ]; then \ >> + git describe> "$@"; \ >> + else \ >> + cp VERSION "$@"; \ >> diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb b/meta/recipes-extended/ltp/ltp_20120401.bb >> index 912d6d9..563bd58 100644 >> --- a/meta/recipes-extended/ltp/ltp_20120401.bb >> +++ b/meta/recipes-extended/ltp/ltp_20120401.bb >> @@ -21,10 +21,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ >> >> DEPENDS = "attr" >> >> -PR = "r3" >> +PR = "r4" >> >> SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ >> - " >> + file://fix_building_fom_archive.patch" >> >> SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d" >> SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1" >> -- >> 1.7.9.5 >> >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > This patch seems to be causing build failures: > > | ERROR: Function failed: do_compile (see > /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/temp/log.do_compile.695 > for further information) > | NOTE: make -j 16 > | make -C "lib" \ > | -f "/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib/Makefile" > all > | git describe&> /dev/null > | make: *** [Version] Error 128 > | make: *** Waiting for unfinished jobs.... > | make[1]: Entering directory > `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' > | make[1]: Nothing to be done for `all'. > | make[1]: Leaving directory > `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' > | ERROR: oe_runmake failed > > You might want to use "-git describe&> /dev/null", as this will ignore errors, I thought you tested the final patch? From the make manual pages: To ignore errors in a recipe line, write a ‘-’ at the beginning of the line's text (after the initial tab). The ‘-’ is discarded before the line is passed to the shell for execution. For example, clean: -rm -f *.o This causes make to continue even if rm is unable to remove a file. > > -b >
Hello all, @Saul: Of course I have tested the final patch, I will re-test and get back to you. It worked for me. Thanks, Cristian -----Original Message----- From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Saul Wold Sent: Tuesday, June 05, 2012 3:20 AM To: Patches and discussions about the oe-core layer Subject: Re: [OE-core] [PATCH] ltp: Add patch to correct failing build On 06/02/2012 09:59 AM, Flanagan, Elizabeth wrote: > On Fri, Jun 1, 2012 at 12:52 AM, Cristian Iorga > <cristian.iorga@intel.com> wrote: >> ltp makefile does not interpret correctly the result of git describe >> command and assumes that it is working with a git repo, while in fact >> working with a source code archive. >> Added a patch to corect makefile system. >> >> Signed-off-by: Cristian Iorga<cristian.iorga@intel.com> >> --- >> .../ltp/ltp/fix_building_fom_archive.patch | 23 ++++++++++++++++++++ >> meta/recipes-extended/ltp/ltp_20120401.bb | 4 ++-- >> 2 files changed, 25 insertions(+), 2 deletions(-) >> create mode 100644 >> meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> >> diff --git >> a/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> new file mode 100644 >> index 0000000..c0ecc86 >> --- /dev/null >> +++ b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> @@ -0,0 +1,23 @@ >> +ltp package build system is broken if building from archive >> + >> +ltp makefile does not interpret correctly the result of git describe >> +command and assumes that it is working with a git repo, while in >> +fact working with a source code archive. >> + >> +Upstream-Status: Pending >> +Signed-off-by: Cristian Iorga<cristian.iorga@intel.com> >> + >> +Index: ltp-20120401/Makefile >> +=================================================================== >> +--- ltp-20120401.orig/Makefile >> ++++ ltp-20120401/Makefile >> +@@ -173,7 +173,8 @@ SRCDIR_INSTALL_TARGETS := $(SRCDIR_INSTA >> + # >> + .PHONY: Version >> + Version: >> +- if git describe&> /dev/null; then \ >> ++ git describe&> /dev/null >> ++ if [ $? -eq 0 ]; then \ >> + git describe> "$@"; \ >> + else \ >> + cp VERSION "$@"; \ >> diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb >> b/meta/recipes-extended/ltp/ltp_20120401.bb >> index 912d6d9..563bd58 100644 >> --- a/meta/recipes-extended/ltp/ltp_20120401.bb >> +++ b/meta/recipes-extended/ltp/ltp_20120401.bb >> @@ -21,10 +21,10 @@ LIC_FILES_CHKSUM = >> "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ >> >> DEPENDS = "attr" >> >> -PR = "r3" >> +PR = "r4" >> >> SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ >> - " >> + file://fix_building_fom_archive.patch" >> >> SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d" >> SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1" >> -- >> 1.7.9.5 >> >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > This patch seems to be causing build failures: > > | ERROR: Function failed: do_compile (see > /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/bu > ild/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/temp/log.do_compile.69 > 5 > for further information) > | NOTE: make -j 16 > | make -C "lib" \ > | -f "/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib/Makefile" > all > | git describe&> /dev/null > | make: *** [Version] Error 128 > | make: *** Waiting for unfinished jobs.... > | make[1]: Entering directory > `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' > | make[1]: Nothing to be done for `all'. > | make[1]: Leaving directory > `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' > | ERROR: oe_runmake failed > > You might want to use "-git describe&> /dev/null", as this will ignore errors, I thought you tested the final patch? From the make manual pages: To ignore errors in a recipe line, write a '-' at the beginning of the line's text (after the initial tab). The '-' is discarded before the line is passed to the shell for execution. For example, clean: -rm -f *.o This causes make to continue even if rm is unable to remove a file. > > -b >
Hello, &> does not work correctly in dash, working to correct the issue. I have tested it by making the target (bitbake ltp), but it is safe to assume that make Version is not issued during normal build. Will propose a new patch. Thanks, Cristian -----Original Message----- From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Iorga, Cristian Sent: Tuesday, June 05, 2012 10:31 AM To: Patches and discussions about the oe-core layer Subject: Re: [OE-core] [PATCH] ltp: Add patch to correct failing build Hello all, @Saul: Of course I have tested the final patch, I will re-test and get back to you. It worked for me. Thanks, Cristian -----Original Message----- From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Saul Wold Sent: Tuesday, June 05, 2012 3:20 AM To: Patches and discussions about the oe-core layer Subject: Re: [OE-core] [PATCH] ltp: Add patch to correct failing build On 06/02/2012 09:59 AM, Flanagan, Elizabeth wrote: > On Fri, Jun 1, 2012 at 12:52 AM, Cristian Iorga > <cristian.iorga@intel.com> wrote: >> ltp makefile does not interpret correctly the result of git describe >> command and assumes that it is working with a git repo, while in fact >> working with a source code archive. >> Added a patch to corect makefile system. >> >> Signed-off-by: Cristian Iorga<cristian.iorga@intel.com> >> --- >> .../ltp/ltp/fix_building_fom_archive.patch | 23 ++++++++++++++++++++ >> meta/recipes-extended/ltp/ltp_20120401.bb | 4 ++-- >> 2 files changed, 25 insertions(+), 2 deletions(-) >> create mode 100644 >> meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> >> diff --git >> a/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> new file mode 100644 >> index 0000000..c0ecc86 >> --- /dev/null >> +++ b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch >> @@ -0,0 +1,23 @@ >> +ltp package build system is broken if building from archive >> + >> +ltp makefile does not interpret correctly the result of git describe >> +command and assumes that it is working with a git repo, while in >> +fact working with a source code archive. >> + >> +Upstream-Status: Pending >> +Signed-off-by: Cristian Iorga<cristian.iorga@intel.com> >> + >> +Index: ltp-20120401/Makefile >> +=================================================================== >> +--- ltp-20120401.orig/Makefile >> ++++ ltp-20120401/Makefile >> +@@ -173,7 +173,8 @@ SRCDIR_INSTALL_TARGETS := $(SRCDIR_INSTA >> + # >> + .PHONY: Version >> + Version: >> +- if git describe&> /dev/null; then \ >> ++ git describe&> /dev/null >> ++ if [ $? -eq 0 ]; then \ >> + git describe> "$@"; \ >> + else \ >> + cp VERSION "$@"; \ >> diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb >> b/meta/recipes-extended/ltp/ltp_20120401.bb >> index 912d6d9..563bd58 100644 >> --- a/meta/recipes-extended/ltp/ltp_20120401.bb >> +++ b/meta/recipes-extended/ltp/ltp_20120401.bb >> @@ -21,10 +21,10 @@ LIC_FILES_CHKSUM = >> "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ >> >> DEPENDS = "attr" >> >> -PR = "r3" >> +PR = "r4" >> >> SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ >> - " >> + file://fix_building_fom_archive.patch" >> >> SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d" >> SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1" >> -- >> 1.7.9.5 >> >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > This patch seems to be causing build failures: > > | ERROR: Function failed: do_compile (see > /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/bu > ild/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/temp/log.do_compile.69 > 5 > for further information) > | NOTE: make -j 16 > | make -C "lib" \ > | -f "/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib/Makefile" > all > | git describe&> /dev/null > | make: *** [Version] Error 128 > | make: *** Waiting for unfinished jobs.... > | make[1]: Entering directory > `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' > | make[1]: Nothing to be done for `all'. > | make[1]: Leaving directory > `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/ppc603e-poky-linux/ltp-20120401-r4/ltp-20120401/lib' > | ERROR: oe_runmake failed > > You might want to use "-git describe&> /dev/null", as this will ignore errors, I thought you tested the final patch? From the make manual pages: To ignore errors in a recipe line, write a '-' at the beginning of the line's text (after the initial tab). The '-' is discarded before the line is passed to the shell for execution. For example, clean: -rm -f *.o This causes make to continue even if rm is unable to remove a file. > > -b >
On Tuesday 05 June 2012 13:29:20 Iorga, Cristian wrote: > &> does not work correctly in dash, working to correct the issue. > I have tested it by making the target (bitbake ltp), but it is safe to > assume that make Version is not issued during normal build. Will propose a > new patch. Indeed, > filename 2>&1 is the recommended alternative. Sadly a git grep '&>' shows that we are currently using this in a number of places, I guess we should fix those. FYI for anyone who hasn't already seen this page, it's a good reference for this kind of thing: http://mywiki.wooledge.org/Bashism Cheers, Paul
Patch
diff --git a/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch new file mode 100644 index 0000000..c0ecc86 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch @@ -0,0 +1,23 @@ +ltp package build system is broken if building from archive + +ltp makefile does not interpret correctly the result of git describe +command and assumes that it is working with a git repo, while in fact +working with a source code archive. + +Upstream-Status: Pending +Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> + +Index: ltp-20120401/Makefile +=================================================================== +--- ltp-20120401.orig/Makefile ++++ ltp-20120401/Makefile +@@ -173,7 +173,8 @@ SRCDIR_INSTALL_TARGETS := $(SRCDIR_INSTA + # + .PHONY: Version + Version: +- if git describe &> /dev/null; then \ ++ git describe &> /dev/null ++ if [ $? -eq 0 ]; then \ + git describe > "$@"; \ + else \ + cp VERSION "$@"; \ diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb b/meta/recipes-extended/ltp/ltp_20120401.bb index 912d6d9..563bd58 100644 --- a/meta/recipes-extended/ltp/ltp_20120401.bb +++ b/meta/recipes-extended/ltp/ltp_20120401.bb @@ -21,10 +21,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS = "attr" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ - " + file://fix_building_fom_archive.patch" SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d" SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1"
ltp makefile does not interpret correctly the result of git describe command and assumes that it is working with a git repo, while in fact working with a source code archive. Added a patch to corect makefile system. Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> --- .../ltp/ltp/fix_building_fom_archive.patch | 23 ++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20120401.bb | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch