Date: Sun, 25 Aug 2013 16:04:07 -0400 From: Mark Johnston <markj@freebsd.org> To: Yuri <yuri@rawbw.com> Cc: freebsd-net@freebsd.org, freebsd-dtrace@freebsd.org Subject: Re: DTrace network providers Message-ID: <20130825200407.GA76615@raichu> In-Reply-To: <5216FC0B.1060304@rawbw.com> References: <20130821045926.GA17196@raichu> <52168B0E.1050308@rawbw.com> <CAMw1wOwsrdOOMuLJPgzaRfiCimrdxti6W%2B1JkWV2uqbW5bb%2BPw@mail.gmail.com> <5216FC0B.1060304@rawbw.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Aug 22, 2013 at 11:07:07PM -0700, Yuri wrote:
> On 08/22/2013 15:30, Mark Johnston wrote:
> > My apologies! It looks like r254523 introduced a conflict. r254468 is a
> > minimum dependency.
> >
> > I'd suggest trying again with r254523 or later.
>
> I don't know what the problem is, but I tried on r254523 and on the
> later r254677, and am getting build error during buildkernel, see below.
> And I did successful buildworld and installworld before this.
>
I suspect that you didn't delete the files added by the patch before
applying the patch a second time. That'll result in two concatenated
copies of the new files, which will cause the build to fail at
in_kdtrace.c. I just made the same mistake myself. :)
>
> --- buildkernel errors ---
> /usr/src/sys/netinet/in_kdtrace.c:165:1: error: redefinition of
> 'sdt_provider_ip'
> SDT_PROVIDER_DEFINE(ip);
> ^
> /usr/src/sys/sys/sdt.h:136:22: note: expanded from macro
> 'SDT_PROVIDER_DEFINE'
> struct sdt_provider sdt_provider_##prov[1] =
> { \
> ^
> <scratch space>:127:1: note: expanded from here
> sdt_provider_ip
> ^
> /usr/src/sys/netinet/in_kdtrace.c:38:1: note: previous definition is here
> SDT_PROVIDER_DEFINE(ip);
> ^
> /usr/src/sys/sys/sdt.h:136:22: note: expanded from macro
> 'SDT_PROVIDER_DEFINE'
> struct sdt_provider sdt_provider_##prov[1] =
> { \
> ^
> <scratch space>:203:1: note: expanded from here
> sdt_provider_ip
> ^
> /usr/src/sys/netinet/in_kdtrace.c:166:1: error: redefinition of
> 'sdt_provider_tcp'
> SDT_PROVIDER_DEFINE(tcp);
> ^
> /usr/src/sys/sys/sdt.h:136:22: note: expanded from macro
> 'SDT_PROVIDER_DEFINE'
> struct sdt_provider sdt_provider_##prov[1] =
> { \
> ^
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130825200407.GA76615>