--- src/Makefile.inc1	2004/10/27 16:34:32	1.44
+++ src/Makefile.inc1	2004/11/05 10:09:52	1.45
@@ -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
 #
@@ -569,6 +577,9 @@ buildkernel:	bk_tools bk_build_list bk_k
 		    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}; \
 	    MAKESRCPATH=${KRNLSRCDIR}/dev/disk/aic7xxx/aicasm \
@@ -608,6 +619,9 @@ nativekernel:	bk_build_list bk_kernwarn
 		    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}; \
 	    MAKESRCPATH=${KRNLSRCDIR}/dev/disk/aic7xxx/aicasm \
@@ -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
 
 #