[oe] error in push of origin/org.openmbedded.dev

Paul Menzel paulepanter at users.sourceforge.net
Tue May 3 22:18:16 UTC 2011


Dear Florian,


Am Dienstag, den 03.05.2011, 17:18 +0200 schrieb Paul Menzel:

> Am Dienstag, den 03.05.2011, 17:03 +0200 schrieb Florian Boor:
> 
> > Am 03.05.2011 16:54, schrieb Paul Menzel:
> > > you pushed to org.open*mb*edded.dev and therefore a new branch was
> > > created.
> > 
> > Args - sorry my bad, I have a typo in the local branch name. Interesting what
> > can happen working on a fresh tree :-)
> > 
> > > Before you push to the correct branch could you maybe clean up the
> > > commit log using `git rebase -i …` or take the improved patches I
> > > attached.
> > 
> > Ok great - many tanks. What else did you change?
> 
> I also squashed the `ubootchart` commits. Everything else was just the
> commit messages.
> 
> Somehow Git should be able to show the differences, but
> 
> 	$ git diff origin/master -- origin/org.openmbedded.dev
> 
> does not work for me.

it would have been better to first commit the new recipe `lsb-base` [2]
before using it in `ushare` [1] to preserve a working tree.


Thanks,

Paul


PS: If anyone cares, the error message for the commit for Zenity [3] is
the following.

        […]
        autoreconf: running: automake --foreign --add-missing --copy --force-missing --warnings=cross
        automake: unknown warning category `cross'
        gnome-doc-utils.make:63: HAVE_GNOME_DOC_UTILS does not appear in AM_CONDITIONAL
        help/Makefile.am:1:   `gnome-doc-utils.make' included from here
        gnome-doc-utils.make:133: ENABLE_SK does not appear in AM_CONDITIONAL
        help/Makefile.am:1:   `gnome-doc-utils.make' included from here
        gnome-doc-utils.make:182: ENABLE_SK does not appear in AM_CONDITIONAL
        help/Makefile.am:1:   `gnome-doc-utils.make' included from here
        autoreconf: automake failed with exit status: 1
        + oefatal 'autoreconf execution failed.'
        + echo FATAL: 'autoreconf execution failed.'
        FATAL: autoreconf execution failed.
        + exit 1


[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=0fd385ef5512def0db880139b1c9fa78f652f494
[2] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=419cb686b0bfe393f7c350ac881b46e8e2a14795
[3] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=35393002bb5aa476e281a004f7dc64aeefcb2c9e
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20110504/1d6b56a7/attachment-0002.sig>


More information about the Openembedded-devel mailing list