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] = > { \ > ^ > _______________________________________________ freebsd-net@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-net To unsubscribe, send any mail to "freebsd-net-unsubscr...@freebsd.org"