From 645eff3a855254a1fd4271016d679ddf41bda9b5 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Fri, 14 Oct 2016 18:43:03 +0000 Subject: Kernel builds now happen in compile/CONFIG/obj@ -> /usr/obj/... [or ./obj/, if srctree is not rooted at /usr/src]. As a result, stock GENERIC & RAMDISK kernels are commited to the tree, to ensure the src tree can be "readonly" during builds, with all writes occuring inside the obj space. config -b options are handled by ../Makefile.inc. The canonical new way to configure one of these kernels is: % cd /sys/arch/amd64/compile/GENERIC.MP % doas make obj % make config % make % doas cp obj/bsd /bsd The build infrastructure will use this new mechanism in a de-escalation way using BUILDUSER. Much help from natano and tb. --- sys/arch/landisk/conf/Makefile.landisk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/arch/landisk/conf') diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index 9da500698bd..019922c3738 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.55 2016/09/24 19:13:03 kettenis Exp $ +# $OpenBSD: Makefile.landisk,v 1.56 2016/10/14 18:43:01 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -21,7 +21,7 @@ S!= cd ../../../..; pwd _machdir?= $S/arch/${_mach} _archdir?= $S/arch/${_arch} -INCLUDES= -nostdinc -I$S -I. -I$S/arch +INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP CWARNFLAGS= -Werror -Wall -Wimplicit-function-declaration \ -Wno-main -Wno-uninitialized -Wno-pointer-sign \ @@ -125,6 +125,8 @@ lint: ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' +obj: + depend: @touch $@ -- cgit v1.2.3