From: "Mathieu Dubois-Briand" <mathieu.dubois-briand@bootlin.com>
To: "Marcel Ziswiler" <marcel@ziswiler.com>,
<openembedded-core@lists.openembedded.org>
Cc: "Alexander Kanavin" <alex.kanavin@gmail.com>
Subject: Re: [OE-core] [PATCH v2] gettext: upgrade 0.22.5 -> 0.23
Date: Thu, 26 Dec 2024 12:24:26 +0100 [thread overview]
Message-ID: <D6LLEUFB3992.32ILPEG9SHGJ@bootlin.com> (raw)
In-Reply-To: <c17236c58b3d7f041746b0ede69c271d1c7f8eed.camel@ziswiler.com>
On Thu Dec 26, 2024 at 11:47 AM CET, Marcel Ziswiler wrote:
> Hi Mathieu
>
> On Thu, 2024-12-26 at 10:42 +0100, Mathieu Dubois-Briand wrote:
> > On Wed Dec 25, 2024 at 11:32 AM CET, Marcel Ziswiler wrote:
> > > Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
> > > ---
> > >
> >
> > Hi Marcel,
> >
> > I'm taking this patch in my branch, but just a quick note: it looks like
> > you setup is breaking the patch format while sending it, so picking it
> > is a bit painful. Particularly, it looks like it drops spaces on line
> > ends, which do mess the changes on patches.
>
> V1 indeed had an issue but V2 I sent straight with patman which uses git format-patch and git send-email and
> should not mess with any such.
>
> > Can you fix this for your next patches please ?
>
> I am happy to fix anything but V2 should really apply cleanly, not?
No, I still had the issue. Either using b4 or saving the raw mail, the
patch does not apply. Running:
b4 am -s 20241225103244.3514559-1-marcel@ziswiler.com
git am v2_20241225_marcel_gettext_upgrade_0_22_5_0_23.mbx
The git am fails with:
Applying: gettext: upgrade 0.22.5 -> 0.23
error: patch failed: meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch:1
error: meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch: patch does not apply
error: patch failed: meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch:16
error: meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch: patch does not apply
error: patch failed: meta/recipes-core/gettext/gettext/parallel.patch:15
error: meta/recipes-core/gettext/gettext/parallel.patch: patch does not apply
error: patch failed: meta/recipes-core/gettext/gettext/serial-tests-config.patch:41
error: meta/recipes-core/gettext/gettext/serial-tests-config.patch: patch does not apply
error: patch failed: meta/recipes-core/gettext/gettext/use-pkgconfig.patch:30
error: meta/recipes-core/gettext/gettext/use-pkgconfig.patch: patch does not apply
Patch failed at 0001 gettext: upgrade 0.22.5 -> 0.23
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2024-12-26 11:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-25 10:32 [PATCH v2] gettext: upgrade 0.22.5 -> 0.23 Marcel Ziswiler
2024-12-25 10:46 ` Patchtest results for " patchtest
2024-12-26 9:42 ` [OE-core] " Mathieu Dubois-Briand
2024-12-26 10:47 ` Marcel Ziswiler
2024-12-26 11:24 ` Mathieu Dubois-Briand [this message]
2024-12-27 7:52 ` Marcel Ziswiler
2024-12-26 11:30 ` Mathieu Dubois-Briand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D6LLEUFB3992.32ILPEG9SHGJ@bootlin.com \
--to=mathieu.dubois-briand@bootlin.com \
--cc=alex.kanavin@gmail.com \
--cc=marcel@ziswiler.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox