diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-10-14 18:45:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-10-14 18:45:13 +0000 |
| commit | f3a1927a54bcea1c76a87330fdc5cba70894f520 (patch) | |
| tree | 614fec76e38e61e6beca58abd972c5c6ad259b86 | |
| parent | 23a80e29c513664cb6797d99d47e527db9f1619b (diff) | |
Build the bundle of GENERIC* kernels in using the new compile metods,
and de-escalate to $BUILDUSER.
Much help from natano and tb.
| -rw-r--r-- | etc/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile index c3d30889e52..d85fc0e9ddd 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.442 2016/10/09 20:55:16 natano Exp $ +# $OpenBSD: Makefile,v 1.443 2016/10/14 18:45:12 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -15,16 +15,15 @@ KERNELS = GENERIC bsd .for CONF K in ${KERNELS} . if !target($K) $K: - cd ../sys/arch/${MACHINE}/conf && config ${CONF} - cd ../sys/arch/${MACHINE}/compile/${CONF} && \ + cd ../sys/arch/${MACHINE}/compile/${CONF} && ${MAKE} config && \ ${MAKE} clean && exec ${MAKE} . endif ALL_KERNELS += $K .endfor -kernels: bootblocks ${ALL_KERNELS} +kernels: ${ALL_KERNELS} .for CONF K in ${KERNELS} - cp ../sys/arch/${MACHINE}/compile/${CONF}/bsd ${RELEASEDIR}/$K + cp ../sys/arch/${MACHINE}/compile/${CONF}/obj/bsd ${RELEASEDIR}/$K .endfor # -rw-r--r-- @@ -267,7 +266,8 @@ release: release-sets: su ${BUILDUSER} -c 'exec ${MAKE} distribution' - ${MAKE} kernels + su ${BUILDUSER} -c 'exec ${MAKE} kernels' + ${MAKE} bootblocks cd ${RELEASEDIR} && rm -f SHA256 cd ../distrib/sets && exec su ${BUILDUSER} -c 'exec sh maketars ${OSrev}' |