vkernel - Scrap some old install stuff that no longer applies
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 9 Oct 2010 22:23:55 +0000 (15:23 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 9 Oct 2010 22:23:55 +0000 (15:23 -0700)
* Scrap some stuff that prevented vkernels from being
  installed properly.

Submitted-by: Rumko
sys/conf/kern.paths.mk
sys/conf/kern.post.mk

index ad7c5a6..c78a560 100644 (file)
@@ -19,6 +19,4 @@ OLDMODULESDIR?=               /boot/modules
 # not to shoot the real kernel installation.
 .if ${MACHINE_PLATFORM} == vkernel || ${MACHINE_PLATFORM} == vkernel64
 DESTDIR?=              /var/vkernel
-# Unset DESTKERNDIR as we install the kernel directly into $DESTDIR
-DESTKERNDIR=
 .endif
index 256c7e9..cafdfcd 100644 (file)
@@ -123,11 +123,8 @@ kernel-install: kernel-installable
        @if [ -f ${DESTDIR}${DESTKERNDIR}.old ]; then           \
                rm -f ${DESTDIR}${DESTKERNDIR}.old;             \
        fi
-# Skip this step for vkernels
-.if ${MACHINE_PLATFORM} != vkernel && ${MACHINE_PLATFORM} != vkernel64
        mkdir -p ${DESTDIR}${DESTKERNDIR}.old
-.endif
-.  if exists(${DESTDIR}${DESTKERNDIR}/${DESTKERNNAME})
+.if exists(${DESTDIR}${DESTKERNDIR}/${DESTKERNNAME})
 .ifndef NOFSCHG
        -chflags noschg ${DESTDIR}${DESTKERNDIR}/${DESTKERNNAME}
 .endif
@@ -136,7 +133,7 @@ kernel-install: kernel-installable
 .    else
        ${OBJCOPY} --strip-debug ${DESTDIR}${DESTKERNDIR}/${DESTKERNNAME} ${DESTDIR}${DESTKERNDIR}.old/${DESTKERNNAME}
 .    endif
-.  endif
+.endif
        @if [ -f ${DESTDIR}${DESTKERNDIR} ]; then               \
                chflags noschg ${DESTDIR}${DESTKERNDIR};        \
                rm -f ${DESTDIR}${DESTKERNDIR};                 \