[PATCH] Set the default DESTDIR to /var/vkernel when the platform is vkernel. This saves some keystrokes as long as you use the standard installation location for vkernel(as shown in vkernel(7)).

YONETANI Tomokazu y0netan1 at dragonflybsd.org
Sat Feb 7 11:29:46 PST 2009


---
 sys/conf/kern.paths.mk |    6 ++++++
 sys/conf/kern.post.mk  |    5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys/conf/kern.paths.mk b/sys/conf/kern.paths.mk
index 93c3fd0..72fb70e 100644
--- a/sys/conf/kern.paths.mk
+++ b/sys/conf/kern.paths.mk
@@ -13,3 +13,9 @@ DESTKERNNAME?=		${KERNEL}
 DESTMODULESNAME?=	modules
 .endif
 DESTKERNDIR?=		/boot
+
+# Set DESTDIR to /var/vkernel by default for vkernel platform so as
+# not to shoot the real kernel installation.
+.if ${MACHINE_PLATFORM} == vkernel
+DESTDIR?=		/var/vkernel
+.endif
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index de0dc8e..e95b3ce 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -142,11 +142,6 @@ kernel-reinstall: kernel-installable
 .endif
 
 kernel-installable:
-.if ${P} == vkernel
-.if !defined(DESTDIR)
-	@echo "When installing a virtual kernel, DESTDIR must be manually specified"
-	@exit 1
-.endif
 	@if [ -f ${DESTDIR}/${DESTKERNNAME} ]; then \
 		echo "You need to make buildworld, installworld, and upgrade"; \
 		echo "before you can install a new kernel, because the"; \
-- 
1.6.0.6


--gBBFr7Ir9EOA20Yy--





More information about the Bugs mailing list