diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-10-14 18:44:21 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-10-14 18:44:21 +0000 |
| commit | 23a80e29c513664cb6797d99d47e527db9f1619b (patch) | |
| tree | 56eed512fa766092195c78df722245f8ce92cc77 /distrib/amd64/common | |
| parent | 645eff3a855254a1fd4271016d679ddf41bda9b5 (diff) | |
Use new kernel compile method for ramdisks, de-escalating to $BUILDUSER
as required.
much help from natano and tb.
Diffstat (limited to 'distrib/amd64/common')
| -rw-r--r-- | distrib/amd64/common/Makefile.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc index 8a2bfea4d86..5317cf02803 100644 --- a/distrib/amd64/common/Makefile.inc +++ b/distrib/amd64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.28 2015/09/07 01:41:35 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.29 2016/10/14 18:44:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -78,10 +78,9 @@ bsd.rd: ${IMAGE} bsd rdsetroot bsd: - cd ${.CURDIR}/../../../sys/arch/amd64/conf && config ${RAMDISK} cd ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK} && \ - ${MAKE} clean && COPTS=-Os exec ${MAKE} - cp ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK}/bsd bsd + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}' + cp -p ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK}/obj/bsd bsd ${IMAGE}: ${CBIN} rd_setup do_files rd_teardown |