From: Christian Eggers <ceggers@arri.de>
To: Khem Raj <raj.khem@gmail.com>
Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>,
"Clément Péron" <peron.clem@gmail.com>
Subject: Re: [oe] [meta-oe][PATCH RFC] pcapplusplus: add new recipe
Date: Wed, 23 Feb 2022 19:41:27 +0100 [thread overview]
Message-ID: <4795452.0VBMTVartN@localhost.localdomain> (raw)
In-Reply-To: <CAMKF1srreo8BKes+3DDnJWjkmu-ZdGqFKeGF7_x3dxUj08xrJQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]
On Wednesday, 23 February 2022, 18:21:00 CET, Khem Raj wrote:
> https://errors.yoctoproject.org/Errors/Details/636127/
>
> NOTE: Applying patch '0001-Fix-timeval-to-timespec-conversions.patch' (sources/meta-openembedded/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Fix-timeval-to-timespec-conversions.patch)
> ERROR: Applying patch '0001-Fix-timeval-to-timespec-conversions.patch' on target directory 'TOPDIR/build/tmp/work/mips32r2-yoe-linux/pcapplusplus/gitAUTOINC+1360d0ed91-r0/git'
> CmdError('quilt --quiltrc TOPDIR/build/tmp/work/mips32r2-yoe-linux/pcapplusplus/gitAUTOINC+1360d0ed91-r0/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0001-Fix-timeval-to-timespec-conversions.patch
> patching file Pcap++/src/NetworkUtils.cpp
> Hunk #1 FAILED at 169 (different line endings).
> Hunk #2 FAILED at 436 (different line endings).
> 2 out of 2 hunks FAILED -- rejects in file Pcap++/src/NetworkUtils.cpp
> patching file Pcap++/src/PcapFileDevice.cpp
> Hunk #1 FAILED at 188 (different line endings).
> 1 out of 1 hunk FAILED -- rejects in file Pcap++/src/PcapFileDevice.cpp
> Patch 0001-Fix-timeval-to-timespec-conversions.patch does not apply (enforce with -f)
After cloning PcapPlusPlus on my machine, Pcap++/src/PcapFileDevice.cpp has
Windows line endings. The patch has the same for changed lines and the
context.
Is there an implicit conversion from Windows to Unix line endings on
the build machine (e.g. by git)? Are line feeds altered on when sent
via `git send-email`?
For reference, I have a attached the patch file to this email.
regards
Christian
[-- Attachment #2: 0001-Fix-timeval-to-timespec-conversions.patch.gz --]
[-- Type: application/gzip, Size: 1141 bytes --]
next prev parent reply other threads:[~2022-02-23 18:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 6:41 [meta-oe][PATCH RFC] pcapplusplus: add new recipe Christian Eggers
2022-02-23 17:21 ` [oe] " Khem Raj
2022-02-23 18:41 ` Christian Eggers [this message]
2022-02-23 18:45 ` Khem Raj
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=4795452.0VBMTVartN@localhost.localdomain \
--to=ceggers@arri.de \
--cc=openembedded-devel@lists.openembedded.org \
--cc=peron.clem@gmail.com \
--cc=raj.khem@gmail.com \
/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 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.