From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4] igmpproxy: bump version to a731683d1a65956fa05024b0597b105fe6a3a122
Date: Fri, 10 Jun 2016 00:11:55 +0200 [thread overview]
Message-ID: <20160610001155.4296260a@free-electrons.com> (raw)
In-Reply-To: <1463685189.2081.13.camel@embedded.rocks>
Hello,
On Thu, 19 May 2016 21:13:09 +0200, J?rg Krause wrote:
> # Use standard unsigned integer types for fixing musl build
> IGMPPROXY_PATCH =?https://github.com/pali/igmpproxy/commit/33a69727c936
> e81aff312d1f92ab5681a77b095d.patch
> # Fix ucLinux support
> IGMPPROXY_PATCH +=?https://github.com/pali/igmpproxy/commit/0e3af272c87
> d77cc81740436fcf6bc69e0c3c215.patch
Unfortunately, this doesn't work, because
33a69727c936e81aff312d1f92ab5681a77b095d.patch fails to apply, most
likely because it depends on other commits:
>>> igmpproxy 0.1 Patching
support/scripts/apply-patches.sh /home/thomas/projets/buildroot/output/build/igmpproxy-0.1 /home/thomas/dl 33a69727c936e81aff312d1f92ab5681a77b095d.patch
Applying 33a69727c936e81aff312d1f92ab5681a77b095d.patch using patch:
patching file src/igmp.c
Hunk #1 FAILED at 79.
Hunk #2 FAILED at 230.
2 out of 2 hunks FAILED -- saving rejects to file src/igmp.c.rej
patching file src/kern.c
patching file src/lib.c
patching file src/os-dragonfly.h
patching file src/os-freebsd.h
patching file src/os-linux.h
patching file src/os-netbsd.h
patching file src/os-openbsd.h
Patch failed! Please fix 33a69727c936e81aff312d1f92ab5681a77b095d.patch!
package/pkg-generic.mk:159: recipe for target '/home/thomas/projets/buildroot/output/build/igmpproxy-0.1/.stamp_patched' failed
We could also integrate those commits in IGMPPROXY_PATCH, or we could
adjust the patch and keep it in package/igmpproxy/. All in all, I think
Matt's original solution is good enough, so I applied his patch.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2016-06-09 22:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-19 14:38 [Buildroot] [PATCH v4] igmpproxy: bump version to a731683d1a65956fa05024b0597b105fe6a3a122 Matt Weber
2016-05-19 19:13 ` Jörg Krause
2016-06-09 22:11 ` Thomas Petazzoni [this message]
2016-06-09 22:11 ` Thomas Petazzoni
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=20160610001155.4296260a@free-electrons.com \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/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.