From 2f00651dae5470cd7c77ec8203e3d37591fb9522 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Sat, 13 Mar 2004 15:46:34 +0000
Subject: [PATCH] Create hierarchy before installing a new kernel.  This is
 needed because we require that a new kernel be installed prior to a new
 world, and we may need some new directories to succeed.

Once MFCed, this will also help those poor souls who redundantly
``mv /modules /modules.old'' in RELENG_4 before an installkernel.

Requested by:	many
MFC after:	3 days
---
 Makefile.inc1 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 6b4eaec5e608..f6664ca3399b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -581,6 +581,15 @@ reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS}
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."
 	false
 .endif
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Making hierarchy"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR}; \
+	    ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Installing kernel"
+	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${CROSSENV} PATH=${TMPPATH} \
 	    ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}