Browse Source

Build the bundle of GENERIC* kernels in using the new compile metods,

and de-escalate to $BUILDUSER.
Much help from natano and tb.
OPENBSD_6_1
deraadt 8 years ago
parent
commit
b6f412be05
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      src/etc/Makefile

+ 6
- 6
src/etc/Makefile View File

@ -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 TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -15,16 +15,15 @@ KERNELS = GENERIC bsd
.for CONF K in ${KERNELS} .for CONF K in ${KERNELS}
. if !target($K) . if !target($K)
$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} ${MAKE} clean && exec ${MAKE}
. endif . endif
ALL_KERNELS += $K ALL_KERNELS += $K
.endfor .endfor
kernels: bootblocks ${ALL_KERNELS}
kernels: ${ALL_KERNELS}
.for CONF K in ${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 .endfor
# -rw-r--r-- # -rw-r--r--
@ -267,7 +266,8 @@ release:
release-sets: release-sets:
su ${BUILDUSER} -c 'exec ${MAKE} distribution' su ${BUILDUSER} -c 'exec ${MAKE} distribution'
${MAKE} kernels
su ${BUILDUSER} -c 'exec ${MAKE} kernels'
${MAKE} bootblocks
cd ${RELEASEDIR} && rm -f SHA256 cd ${RELEASEDIR} && rm -f SHA256
cd ../distrib/sets && exec su ${BUILDUSER} -c 'exec sh maketars ${OSrev}' cd ../distrib/sets && exec su ${BUILDUSER} -c 'exec sh maketars ${OSrev}'


Loading…
Cancel
Save