Patchwork error in push of origin/org.openmbedded.dev

login
register
mail settings
Submitter Paul Menzel
Date May 3, 2011, 2:54 p.m.
Message ID <1304434485.13481.79.camel@mattotaupa>
Download mbox | patch
Permalink /patch/3109/
State New, archived
Headers show

Comments

Paul Menzel - May 3, 2011, 2:54 p.m.
Dear Florian,


you pushed to org.open*mb*edded.dev and therefore a new branch was
created.

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.

I removed the wrong and reverted commit and for the ProFTP recipe I put
`PR = "r0"`.

Looking through the commits it would be better to review them first on
the list in my opinion since they still have small style errors.


Thanks,

Paul
Florian Boor - May 3, 2011, 3:03 p.m.
Hi Paul,

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?

Greetings

Florian
Paul Menzel - May 3, 2011, 3:18 p.m.
Dear Florian,


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.


Thanks,

Paul
Chris Larson - May 3, 2011, 4:25 p.m.
On Tue, May 3, 2011 at 8:03 AM, Florian Boor
<florian.boor@kernelconcepts.de> wrote:
> 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 :-)

All the more reason to use master, which is less prone to such typos.
org.openembedded.dev is just a compatibility pointer at master, master
is the real branch.
Paul Menzel - May 3, 2011, 10:18 p.m.
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
Paul Menzel - May 4, 2011, 12:22 p.m.
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.

[…]

task fetch of `lsb-base` fails

        […]
        NOTE: package lsb-base-3.2-r0: task do_fetch: Started
        --2011-05-04 13:26:04--  http://ftp.de.debian.org/debian/pool/main/l/lsb/lsb_3.2-23.tar.gz
         Resolving ftp.de.debian.org... 141.76.2.4
         Connecting to ftp.de.debian.org|141.76.2.4|:80... connected.
         HTTP request sent, awaiting response... 404 Not Found
         2011-05-04 13:26:05 ERROR 404: Not Found.
        […]

and task patch of proftpd fails too.

        NOTE: package proftpd-1.3.3c-r0: task do_patch: Started
        ERROR: Execution of 'quilt --quiltrc=/oe/build-angstrom-next/angstrom-dev/sysroots/i686-linux/usr/bin/quiltrc push' failed with exit code 1:
        Applying patch proftpd-install-nostrip.patch
        patching file Make.rules.in
        Hunk #1 FAILED at 28.
        1 out of 1 hunk FAILED -- rejects in file Make.rules.in
        Patch proftpd-install-nostrip.patch can be reverse-applied
        
        NOTE: package proftpd-1.3.3c-r0: task patch_do_patch: Failed
        ERROR: Function 'patch_do_patch' failed
        ERROR: Task 1 (/oe/openembedded/recipes/proftpd/proftpd_1.3.3c.bb, do_patch) failed with exit code '1'
        ERROR: '/oe/openembedded/recipes/proftpd/proftpd_1.3.3c.bb' failed

Could you please take a look.


Thanks,

Paul
Florian Boor - May 4, 2011, 2:20 p.m.
Hi Paul,

Am 04.05.2011 14:22, schrieb Paul Menzel:
> Could you please take a look.

oh well... if things fail they fail completely :-(

I will take a look this evening.

Greetings

Florian

Patch

From 2497edd853c45455a10e309a0790f132f78b6699 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian@kernelconcepts.de>
Date: Fri, 7 Jan 2011 15:06:05 +0100
Subject: [PATCH] gpe-lights: fix license

Signed-off-by: Florian Boor <florian@kernelconcepts.de>
---

The sentence in the commit log was redundant.
---

 recipes/gpe-lights/gpe-lights_0.13.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/gpe-lights/gpe-lights_0.13.bb b/recipes/gpe-lights/gpe-lights_0.13.bb

index 1930ae9..5968a61 100644

--- a/recipes/gpe-lights/gpe-lights_0.13.bb

+++ b/recipes/gpe-lights/gpe-lights_0.13.bb

@@ -1,11 +1,11 @@ 

 inherit gpe
-LICENSE = "PD"

+LICENSE = "GPLv2+"

 
 DESCRIPTION = "A simple light puzzle."
 DEPENDS = "gtk+ libgpewidget gpe-icons"
 SECTION = "gpe/games"
 PRIORITY = "optional"
-PR = "r1"

+PR = "r2"

 
 SRC_URI += "file://fix-makefiles.patch"
 
-- 

1.7.4.4