summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2017-08-23 13:13:38 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2017-08-23 13:13:38 +0000
commitad8cb88bedd983e6f0522f68dd0cf06b1f5c5886 (patch)
tree05424ff4c9375dd9e5956fe8784a13fb446ff9fd
parent591f90f2c6cd50abfc15685fef9afc3e1b72b3ca (diff)
Install the patched kernel on the build machine just like we do for
userland. ok robert@
-rw-r--r--distrib/syspatch/bsd.syspatch.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/distrib/syspatch/bsd.syspatch.mk b/distrib/syspatch/bsd.syspatch.mk
index 845cba80749..c9d227499c0 100644
--- a/distrib/syspatch/bsd.syspatch.mk
+++ b/distrib/syspatch/bsd.syspatch.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.syspatch.mk,v 1.17 2017/08/21 08:46:33 ajacoutot Exp $
+# $OpenBSD: bsd.syspatch.mk,v 1.18 2017/08/23 13:13:37 ajacoutot Exp $
#
# Copyright (c) 2016-2017 Robert Nagy <robert@openbsd.org>
#
@@ -49,6 +49,7 @@ PATCH_ARGS= -d ${SRCDIR} -z .orig --forward --quiet -E ${PATCH_STRIP}
# miscellaneous variables
SYSPATCH_DIR= ${FAKE}/var/syspatch/${SYSPATCH_SHRT}
FAKE= ${FAKEROOT}/syspatch/${SYSPATCH_SHRT}
+KERNEL= $$(sysctl -n kern.osversion | cut -d '\#' -f 1)
SUBDIR?=
_PATCH_COOKIE= ${ERRATA}/.patch_done
@@ -175,6 +176,9 @@ ${_BUILD_COOKIE}: ${_PATCH_COOKIE} ${_FAKE_COOKIE}
exit 1; }; \
fi; exit 0
. endfor
+# install newly built kernel on the build machine
+ @cd ${SRCDIR}/sys/arch/${MACHINE_ARCH}/compile/${KERNEL} && \
+ make install
.endif
@su ${BUILDUSER} -c 'touch $@'
.endif