From 9a3595909572a762e08dbb46b6b7e0ade7d454af Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 5 Nov 2004 10:09:52 +0000 Subject: [PATCH] Save and restore the 'version' counter file when doing a full buildkernel or nativekernel target so the counter is not reset each time. Note that the quickkernel target will increment the counter only if something has changed. Reported-by: walt Make some minor FBsd->DFly 'update' target cleanups. Submitted-by: Michal Belczyk --- Makefile.inc1 | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2d507b9413..96b3535bb2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.44 2004/10/27 16:34:32 joerg Exp $ +# $DragonFly: src/Makefile.inc1,v 1.45 2004/11/05 10:09:52 dillon Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -506,6 +506,14 @@ INSTALLKERNEL= ${_kernel} .endif .endfor +# kernel version numbers survive rm -rf +# +.for _kernel in ${BUILDKERNELS} +.if exists(${KRNLOBJDIR}/${_kernel}/version) +KERNEL_VERSION_${_kernel} != cat ${KRNLOBJDIR}/${_kernel}/version +.endif +.endfor + # # buildkernel # @@ -568,6 +576,9 @@ buildkernel: bk_tools bk_build_list bk_kernwarn PATH=${STRICTTMPPATH} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ ${KERNCONFDIR}/${_kernel} +.endif +.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) && defined(KERNEL_VERSION_${_kernel}) + echo ${KERNEL_VERSION_${_kernel}} > ${KRNLOBJDIR}/${_kernel}/version .endif touch ${KRNLOBJDIR}/${_kernel}/.buildkernel_run cd ${KRNLOBJDIR}/${_kernel}; \ @@ -607,6 +618,9 @@ nativekernel: bk_build_list bk_kernwarn cd ${KRNLCONFDIR}; \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ ${KERNCONFDIR}/${_kernel} +.endif +.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) && defined(KERNEL_VERSION_${_kernel}) + echo ${KERNEL_VERSION_${_kernel}} > ${KRNLOBJDIR}/${_kernel}/version .endif touch ${KRNLOBJDIR}/${_kernel}/.nativekernel_run cd ${KRNLOBJDIR}/${_kernel}; \ @@ -701,9 +715,10 @@ update: .endif .if defined(CVS_UPDATE) @echo "--------------------------------------------------------------" - @echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT} + @echo ">>> Updating ${.CURDIR} from cvs repository `cat ${.CURDIR}/CVS/Root`" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; cvs -q update -rRELENG_4 -P -d + @sleep 2 + cd ${.CURDIR}; cvs -q update -P -d .endif # -- 2.41.0