From owner-freebsd-current@FreeBSD.ORG Tue Oct 24 16:54:26 2006 Return-Path: X-Original-To: current@FreeBSD.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C7B616A412; Tue, 24 Oct 2006 16:54:26 +0000 (UTC) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (relay0.rambler.ru [81.19.66.187]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC5B743D4C; Tue, 24 Oct 2006 16:54:25 +0000 (GMT) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (localhost [127.0.0.1]) by relay0.rambler.ru (Postfix) with ESMTP id D4E2262EB; Tue, 24 Oct 2006 20:52:13 +0400 (MSD) Received: from edoofus.park.rambler.ru (unknown [81.19.65.108]) by relay0.rambler.ru (Postfix) with ESMTP id 38B715F40; Tue, 24 Oct 2006 20:49:28 +0400 (MSD) Received: (from ru@localhost) by edoofus.park.rambler.ru (8.13.8/8.13.8) id k9OGnS0d040126; Tue, 24 Oct 2006 20:49:28 +0400 (MSD) (envelope-from ru) Date: Tue, 24 Oct 2006 20:49:28 +0400 From: Ruslan Ermilov To: Divacky Roman Message-ID: <20061024164928.GF21304@rambler-co.ru> References: <20061024160433.GA17311@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="w3uUfsyyY1Pqa/ej" Content-Disposition: inline In-Reply-To: <20061024160433.GA17311@stud.fit.vutbr.cz> User-Agent: Mutt/1.5.13 (2006-08-11) X-Virus-Scanned: No virus found Cc: Robert Watson , current@FreeBSD.org Subject: Re: GENERIC build on recent -currento n amd64 broken X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Oct 2006 16:54:26 -0000 --w3uUfsyyY1Pqa/ej Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 24, 2006 at 06:04:34PM +0200, Divacky Roman wrote: > In file included from ../../../kern/kern_module.c:433: > ../../../compat/freebsd32/freebsd32_proto.h:301: error: redefinition of `= struct audit_args' > ../../../compat/freebsd32/freebsd32_proto.h:305: error: redefinition of `= struct auditon_args' > ../../../compat/freebsd32/freebsd32_proto.h:310: error: redefinition of `= struct getauid_args' > ../../../compat/freebsd32/freebsd32_proto.h:313: error: redefinition of `= struct setauid_args' > ../../../compat/freebsd32/freebsd32_proto.h:316: error: redefinition of `= struct getaudit_args' > ../../../compat/freebsd32/freebsd32_proto.h:319: error: redefinition of `= struct setaudit_args' > ../../../compat/freebsd32/freebsd32_proto.h:322: error: redefinition of `= struct getaudit_addr_args' > ../../../compat/freebsd32/freebsd32_proto.h:326: error: redefinition of `= struct setaudit_addr_args' > ../../../compat/freebsd32/freebsd32_proto.h:330: error: redefinition of `= struct auditctl_args' > ../../../compat/freebsd32/freebsd32_proto.h:395: warning: redundant redec= laration of 'audit' > ../../../sys/sysproto.h:1760: warning: previous declaration of 'audit' wa= s here > ../../../compat/freebsd32/freebsd32_proto.h:396: warning: redundant redec= laration of 'auditon' > ../../../sys/sysproto.h:1761: warning: previous declaration of 'auditon' = was here >=20 Apply this patch, then type "make" while in sys/compat/freebsd32, then try to build kernel again. %%% Index: syscalls.master =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/compat/freebsd32/syscalls.master,v retrieving revision 1.84 diff -u -p -r1.84 syscalls.master --- syscalls.master 24 Oct 2006 13:49:44 -0000 1.84 +++ syscalls.master 24 Oct 2006 16:48:04 -0000 @@ -733,21 +733,23 @@ const struct timespec32 *timeout); } 443 AUE_NULL NOPROTO { int thr_wake(long id); } 444 AUE_MODUNLOAD NOPROTO { int kldunloadf(int fileid, int flags); } -445 AUE_AUDIT STD { int audit(const void *record, \ +445 AUE_AUDIT STD { int freebsd32_audit(const void *record, \ u_int length); } -446 AUE_AUDITON STD { int auditon(int cmd, void *data, \ +446 AUE_AUDITON STD { int freebsd32_auditon(int cmd, void *data, \ u_int length); } -447 AUE_GETAUID STD { int getauid(uid_t *auid); } -448 AUE_SETAUID STD { int setauid(uid_t *auid); } -449 AUE_GETAUDIT STD { int getaudit(struct auditinfo *auditinfo); } -450 AUE_SETAUDIT STD { int setaudit(struct auditinfo *auditinfo); } -451 AUE_GETAUDIT_ADDR STD { int getaudit_addr( \ +447 AUE_GETAUID STD { int freebsd32_getauid(uid_t *auid); } +448 AUE_SETAUID STD { int freebsd32_setauid(uid_t *auid); } +449 AUE_GETAUDIT STD { int freebsd32_getaudit( \ + struct auditinfo *auditinfo); } +450 AUE_SETAUDIT STD { int freebsd32_setaudit( \ + struct auditinfo *auditinfo); } +451 AUE_GETAUDIT_ADDR STD { int freebsd32_getaudit_addr( \ struct auditinfo_addr *auditinfo_addr, \ u_int length); } -452 AUE_SETAUDIT_ADDR STD { int setaudit_addr( \ +452 AUE_SETAUDIT_ADDR STD { int freebsd32_setaudit_addr( \ struct auditinfo_addr *auditinfo_addr, \ u_int length); } -453 AUE_AUDITCTL STD { int auditctl(char *path); } +453 AUE_AUDITCTL STD { int freebsd32_auditctl(char *path); } 454 AUE_NULL STD { int freebsd32_umtx_op(void *obj, int op,\ u_long val, void *uaddr, \ void *uaddr2); } %%% Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --w3uUfsyyY1Pqa/ej Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFFPkQYqRfpzJluFF4RAh3jAKCOwltxw+M34IKI7F+mLBgCNHwC+gCgjkZC SdXNkvaKx+4MLo3hAUtYc6A= =jg1v -----END PGP SIGNATURE----- --w3uUfsyyY1Pqa/ej--