From owner-cvs-src@FreeBSD.ORG Fri Nov 3 17:26:30 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A430316A417; Fri, 3 Nov 2006 17:26:30 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from sj-iport-6.cisco.com (sj-iport-6.cisco.com [171.71.176.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBBC643D45; Fri, 3 Nov 2006 17:26:28 +0000 (GMT) (envelope-from rrs@cisco.com) Received: from sj-dkim-4.cisco.com ([171.71.179.196]) by sj-iport-6.cisco.com with ESMTP; 03 Nov 2006 09:26:28 -0800 X-IronPort-AV: i="4.09,386,1157353200"; d="scan'208"; a="85121993:sNHT64230399" Received: from sj-core-5.cisco.com (sj-core-5.cisco.com [171.71.177.238]) by sj-dkim-4.cisco.com (8.12.11.20060308/8.12.11) with ESMTP id kA3HQStd025505; Fri, 3 Nov 2006 09:26:28 -0800 Received: from xbh-sjc-221.amer.cisco.com (xbh-sjc-221.cisco.com [128.107.191.63]) by sj-core-5.cisco.com (8.12.10/8.12.6) with ESMTP id kA3HQLW6010424; Fri, 3 Nov 2006 09:26:28 -0800 (PST) Received: from xfe-sjc-212.amer.cisco.com ([171.70.151.187]) by xbh-sjc-221.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 3 Nov 2006 09:26:26 -0800 Received: from [127.0.0.1] ([171.68.225.134]) by xfe-sjc-212.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 3 Nov 2006 09:26:26 -0800 Message-ID: <454B7B9B.70306@cisco.com> Date: Fri, 03 Nov 2006 12:25:47 -0500 From: Randall Stewart User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20060223 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Pawel Worach References: <200611031523.kA3FNGfm010445@repoman.freebsd.org> <454B7703.60705@gmail.com> In-Reply-To: <454B7703.60705@gmail.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 03 Nov 2006 17:26:26.0249 (UTC) FILETIME=[30D60B90:01C6FF6D] DKIM-Signature: a=rsa-sha1; q=dns; l=1997; t=1162574788; x=1163438788; c=relaxed/simple; s=sjdkim4002; h=Content-Type:From:Subject:Content-Transfer-Encoding:MIME-Version; d=cisco.com; i=rrs@cisco.com; z=From:Randall=20Stewart=20 |Subject:Re=3A=20cvs=20commit=3A=20src/sys/compat/freebsd32=20syscalls.master=20s rc/sys/conf=0A=20NOTES=20files=20options=20src/sys/kern=20init_sysent.c=20s yscalls.c=20syscalls.master=0A=20systrace_args.c=20uipc_syscalls.c=20src/sy s/net=20rtsock.c=20src/sys/netinet=20in_proto.c=0A=20sctp.h=20sctp_asconf.c =20...; X=v=3Dcisco.com=3B=20h=3DePpCpEMlCdrbLAVQCRIL0Mw6ru8=3D; b=h8og8CbHAOANsJ4+5mcg8aTeOf2XnyF2pgZbR/l2TWowtk0HAaySgdBqltpoaIZTxraOeMdn QhCqiA8AVv9mhKWAFhe2d1NqaW8KlwAzQAnKx9guYfMVf780vQZVDNXy; Authentication-Results: sj-dkim-4.cisco.com; header.From=rrs@cisco.com; dkim=pass ( sig from cisco.com verified; ); Cc: Randall Stewart , src-committers@FreeBSD.org, cvs-all@FreeBSD.org, cvs-src@FreeBSD.org Subject: Re: cvs commit: src/sys/compat/freebsd32 syscalls.master src/sys/conf NOTES files options src/sys/kern init_sysent.c syscalls.c syscalls.master systrace_args.c uipc_syscalls.c src/sys/net rtsock.c src/sys/netinet in_proto.c sctp.h sctp_asconf.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Nov 2006 17:26:30 -0000 Pawel Worach wrote: > Randall Stewart wrote: > >> rrs 2006-11-03 15:23:16 UTC >> >> FreeBSD src repository >> >> Modified files: > > ... > >> Log: >> Ok, here it is, we finally add SCTP to current. Note that this > > > Hi, > > sctp_asconf.c and sctp6_usrreq.c don't build because __FBSDID macro is > defined in sys/cdefs.h so that needs to be included first. > > Regards > > > ------------------------------------------------------------------------ > > --- sctp6_usrreq.c.orig Fri Nov 3 17:50:49 2006 > +++ sctp6_usrreq.c Fri Nov 3 17:51:26 2006 > @@ -28,7 +28,10 @@ > * THE POSSIBILITY OF SUCH DAMAGE. > */ > /* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */ > + > +#include > __FBSDID("$FreeBSD: src/sys/netinet6/sctp6_usrreq.c,v 1.1 2006/11/03 15:23:15 rrs Exp $"); > + > #include "opt_inet.h" > #include "opt_inet6.h" > #include "opt_inet.h" > > > > ------------------------------------------------------------------------ > > --- sctp_asconf.c.orig Fri Nov 3 17:42:22 2006 > +++ sctp_asconf.c Fri Nov 3 17:42:45 2006 > @@ -29,10 +29,9 @@ > */ > > /* $KAME: sctp_asconf.c,v 1.24 2005/03/06 16:04:16 itojun Exp $ */ > -__FBSDID("$FreeBSD: src/sys/netinet/sctp_asconf.c,v 1.1 2006/11/03 15:23:15 rrs Exp $"); > > #include > - > +__FBSDID("$FreeBSD: src/sys/netinet/sctp_asconf.c,v 1.1 2006/11/03 15:23:15 rrs Exp $"); > > #include "opt_ipsec.h" > #include "opt_compat.h" > Yeah... I found that has I tried to build my second machine off the cvsup .. I commited a fix for it.. sorry about thta.. its the missing sys/cdefs.h or in one of the files cases.. the FRESBSD is in the wrong postion :-) There is some .h's that also have the same problem.. I fixed them all.. even though only these two seem to be the compile breakage :-0 R -- Randall Stewart NSSTG - Cisco Systems Inc. 803-345-0369 803-317-4952 (cell)