svn commit: r433968 - head/Mk/Uses
Rene Ladan
rene at FreeBSD.org
Sun Feb 12 21:53:48 UTC 2017
Author: rene
Date: Sun Feb 12 21:53:47 2017
New Revision: 433968
URL: https://svnweb.freebsd.org/changeset/ports/433968
Log:
Fix check-plist of USES=kmod
No longer depend on (KERN_)DEBUGDIR being non-empty to decide whether to
create the empty KERN_DEBUGDIR/KMODDIR directory, instead use a new
argument 'debug' to indicate this.
Add KERN_DEBUGDIR to PLIST_SUB and MAKE_ENV so that the including ports
can use them.
Ports using kmod:debug do need to add @dir entries to their pkg-plist for
now to prevent 'make check-plist' errors, for example for default KMODDDIR:
@dir /%%KERN_DEBUGDIR%%/%%KMODDIR%%
@dir /%%KERN_DEBUGDIR%%/boot
@dir /%%KERN_DEBUGDIR%%
It would indeed be nice to automate this.
PR: 216879
Submitted by: Sergey Kozlov (kozlov.sergey.404 at gmail.com)
Modified:
head/Mk/Uses/kmod.mk
Modified: head/Mk/Uses/kmod.mk
==============================================================================
--- head/Mk/Uses/kmod.mk Sun Feb 12 21:51:34 2017 (r433967)
+++ head/Mk/Uses/kmod.mk Sun Feb 12 21:53:47 2017 (r433968)
@@ -4,7 +4,7 @@
#
# Feature: kmod
# Usage: USES=kmod
-# Valid ARGS: none
+# Valid ARGS: (none) debug
#
# MAINTAINER: rene at FreeBSD.org
@@ -13,8 +13,12 @@ _INCLUDE_USES_KMOD_MK= yes
_USES_POST+= kmod
-.if !empty(kmod_ARGS)
-IGNORE= USES=kmod takes no arguments
+.if empty(kmod_ARGS)
+_DEBUG_KMOD=
+.elif ${kmod_ARGS} == "debug"
+_DEBUG_KMOD= yes
+.else
+IGNORE= USES=kmod takes either no arguments or 'debug'
.endif
.if !exists(${SRC_BASE}/sys/Makefile)
@@ -34,21 +38,25 @@ MAKE_ENV+= KMODDIR="${KMODDIR}" SYSDIR="
PLIST_FILES+= "@kld ${KMODDIR}"
STRIP_CMD+= --strip-debug # do not strip kernel symbols
+.if !empty(_DEBUG_KMOD)
KERN_DEBUGDIR?= ${DEBUGDIR}
+PLIST_SUB+= KERN_DEBUGDIR="${KERN_DEBUGDIR:C,^/,,}"
+MAKE_ENV+= KERN_DEBUGDIR="${KERN_DEBUGDIR}"
+#XXX (rene): it would be nice to automatically add @dir entries here,
+# they are somehow needed according to 'make makeplist'
+.endif
+
.endif
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_KMOD_POST_MK)
_INCLUDE_USES_KMOD_POST_MK= yes
_USES_install+= 290:${STAGEDIR}${KMODDIR}
-.if !empty(KERN_DEBUGDIR)
-_USES_install+= 291:${STAGEDIR}${KERN_DEBUGDIR}${KMODDIR}
-.endif
-
${STAGEDIR}${KMODDIR}:
@${MKDIR} ${.TARGET}
-.if !empty(KERN_DEBUGDIR)
+.if !empty(_DEBUG_KMOD)
+_USES_install+= 291:${STAGEDIR}${KERN_DEBUGDIR}${KMODDIR}
${STAGEDIR}${KERN_DEBUGDIR}${KMODDIR}:
@${MKDIR} ${.TARGET}
.endif
More information about the svn-ports-head
mailing list