Re: GENERIC build on recent -currento n amd64 broken

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 redeclaration of 'audit'
> ../../../sys/sysproto.h:1760: warning: previous declaration of 'audit' was here
> ../../../compat/freebsd32/freebsd32_proto.h:396: warning: redundant redeclaration of 'auditon'
> ../../../sys/sysproto.h:1761: warning: previous declaration of 'auditon' was here
> 
Apply this patch, then type "make" while in sys/compat/freebsd32,
then try to build kernel again.

%%%
Index: syscalls.master
===================================================================
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
_at__at_ -733,21 +733,23 _at__at_
 				    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,
-- 
Ruslan Ermilov
ru_at_FreeBSD.org
FreeBSD committer