summaryrefslogtreecommitdiff
path: root/distrib/alpha/common
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2016-10-14 18:44:21 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2016-10-14 18:44:21 +0000
commit23a80e29c513664cb6797d99d47e527db9f1619b (patch)
tree56eed512fa766092195c78df722245f8ce92cc77 /distrib/alpha/common
parent645eff3a855254a1fd4271016d679ddf41bda9b5 (diff)
Use new kernel compile method for ramdisks, de-escalating to $BUILDUSER
as required. much help from natano and tb.
Diffstat (limited to 'distrib/alpha/common')
-rw-r--r--distrib/alpha/common/Makefile.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 03854769180..f6dbf7a7a32 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.27 2015/09/19 10:44:01 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.28 2016/10/14 18:44:19 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -73,10 +73,9 @@ bsd.rd: bsd ${IMAGE} rdsetroot
${.OBJDIR}/rdsetroot bsd.rd ${IMAGE}
bsd:
- cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK}
cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \
- ${MAKE} clean && COPTS=-Os exec ${MAKE}
- cp ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/bsd bsd
+ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}'
+ cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/obj/bsd bsd
${IMAGE}: do_prep do_mount do_files do_umount
mv -f ${REALIMAGE} ${IMAGE}