svn commit: r265841 - head/sys/conf

[Warner Losh]

Author: imp
Date: Sat May 10 16:39:15 2014
New Revision: 265841
URL: http://svnweb.freebsd.org/changeset/base/265841

Log:
  bitrotted compat cruft removal:
  o KMODDEPS warning is 15 years stale. Remove it.
  o MK_CTF will always be defined now, so no need to test to see if it
    is defined.
  o no need to define MK_FORMAT_EXTENTIONS if undefined anymore.

Modified:
  head/sys/conf/kern.mk
  head/sys/conf/kmod.mk

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Sat May 10 16:39:08 2014	(r265840)
+++ head/sys/conf/kern.mk	Sat May 10 16:39:15 2014	(r265841)
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-# Compat
-MK_FORMAT_EXTENSIONS?=no
-
 #
 # Warning flags for compiling the kernel and components of the kernel:
 #

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Sat May 10 16:39:08 2014	(r265840)
+++ head/sys/conf/kmod.mk	Sat May 10 16:39:15 2014	(r265841)
@@ -65,10 +65,6 @@ KMODLOAD?=	/sbin/kldload
 KMODUNLOAD?=	/sbin/kldunload
 OBJCOPY?=	objcopy
 
-.if defined(KMODDEPS)
-.error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND"
-.endif
-
 # Note: we're really bsd.kmod.mk, so we have to allow src.opts.mk to be
 # optional. Include it if we can so we can get /etc/src.conf changes,
 # if we're in the tree. If we can't include it that's OK. kern.opts.mk
@@ -204,7 +200,7 @@ ${KMOD}.kld: ${OBJS}
 ${FULLPROG}: ${OBJS}
 .endif
 	${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
-.if defined(MK_CTF) && ${MK_CTF} != "no"
+.if ${MK_CTF} != "no"
 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
 .endif
 .if defined(EXPORT_SYMS)