diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # $FreeBSD$ # -# The user-driven targets are: +# The common user-driven targets are (for a complete list, see build(7)): # # universe - *Really* build *everything* (buildworld and # all kernels on all architectures). Define @@ -148,8 +148,8 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check check-old check-old-dirs check-old-files check-old-libs \ - checkdpadd checkworld clean cleandepend cleandir cleanworld \ - cleanuniverse \ + checkdpadd checkworld clean cleandepend cleandir cleankernel \ + cleanworld cleanuniverse \ delete-old delete-old-dirs delete-old-files delete-old-libs \ depend distribute distributekernel distributekernel.debug \ distributeworld distrib-dirs distribution doxygen \ diff --git a/Makefile.inc1 b/Makefile.inc1 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3420,18 +3420,20 @@ # .if make(cleanworld) BW_CANONICALOBJDIR:=${OBJTOP}/ +.elif make(cleankernel) +BW_CANONICALOBJDIR:=${KRNLOBJDIR}/${KERNCONF}/ .elif make(cleanuniverse) BW_CANONICALOBJDIR:=${OBJROOT} .if ${MK_UNIFIED_OBJDIR} == "no" .error ${.TARGETS} only supported with WITH_UNIFIED_OBJDIR enabled. .endif .endif -cleanworld cleanuniverse: .PHONY +cleanworld cleanuniverse cleankernel: .PHONY .if !empty(BW_CANONICALOBJDIR) && exists(${BW_CANONICALOBJDIR}) && \ ${.CURDIR:tA} != ${BW_CANONICALOBJDIR:tA} - -rm -rf ${BW_CANONICALOBJDIR}* + -(cd ${BW_CANONICALOBJDIR} && rm -rf *) -chflags -R 0 ${BW_CANONICALOBJDIR} - rm -rf ${BW_CANONICALOBJDIR}* + -(cd ${BW_CANONICALOBJDIR} && rm -rf *) .endif .if make(cleanworld) && ${MK_AUTO_OBJ} == "no" && \ (empty(BW_CANONICALOBJDIR) || ${.CURDIR:tA} == ${BW_CANONICALOBJDIR:tA}) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -216,10 +216,15 @@ for cross builds and native builds with variable .Va CROSS_BUILD_TESTING set. +.It Cm cleankernel +Attempts to clean up targets built by a preceding +.Cm buildkernel , +or similar step, built from the same source directory and +.Va KERNCONF . .It Cm cleanworld Attempt to clean up targets built by a preceding .Cm buildworld , -or similar step built from this source directory. +or similar step, built from this source directory. .It Cm cleanuniverse When .Va WITH_UNIFIED_OBJDIR