misc/115414: [patch] latest commit to RELENG_6's src/sys/net/if_tap.c broke buildworld when MODULES_WITH_WORLD=true

[Eugene Grosbein]

>Number:         115414
>Category:       misc
>Synopsis:       [patch] latest commit to RELENG_6's src/sys/net/if_tap.c broke buildworld when MODULES_WITH_WORLD=true
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 11 03:00:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Eugene Grosbein
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
Svyaz-Service JSC
>Environment:
System: FreeBSD grosbein.pp.ru 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat Jul 28 01:42:57 KRAST 2007 eu at grosbein.pp.ru:/usr/obj/usr/local/src/sys/DADV i386

>Description:
	make buildworld breaks on tap(4) module build:

===> sys/modules/if_tap (depend)
rm -f .depend
mkdep -f .depend -a   -nostdinc -D_KERNEL -DKLD_MODULE -I- -I. -I@
-I@/contrib/altq -I@/../include
/usr/obj/src/sys/modules/if_tap/../../net/if_tap.c
/usr/obj/src/sys/modules/if_tap/../../net/if_tap.c:38:24: opt_compat.h: No such file or directory
mkdep: compile failed
*** Error code 1

	The reason is that fix for PR: kern/111480 was incomplete.

>How-To-Repeat:
	cd /usr/src && make MODULES_WITH_WORLD=true buildworld

>Fix:

	Perform MFC of src/sys/modules/if_tap/Makefile,v1.6:

--- Makefile.orig	2007-08-11 10:47:19.000000000 +0800
+++ Makefile	2007-08-11 10:48:14.000000000 +0800
@@ -5,9 +5,12 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_tap
-SRCS=	if_tap.c opt_inet.h vnode_if.h
+SRCS=	if_tap.c opt_compat.h opt_inet.h vnode_if.h
 
 .if !defined(KERNBUILDDIR)
+opt_compat.h:
+	echo "#define COMPAT_FREEBSD6 1" > ${.TARGET}
+
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
 .endif


Eugene Grosbein
>Release-Note:
>Audit-Trail:
>Unformatted: