From owner-svn-soc-all@FreeBSD.ORG Mon Jun 16 20:18:08 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3281C81 for ; Mon, 16 Jun 2014 20:18:08 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF90329E1 for ; Mon, 16 Jun 2014 20:18:08 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5GKI8vh019231 for ; Mon, 16 Jun 2014 20:18:08 GMT (envelope-from op@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5GKI83u019042 for svn-soc-all@FreeBSD.org; Mon, 16 Jun 2014 20:18:08 GMT (envelope-from op@FreeBSD.org) Date: Mon, 16 Jun 2014 20:18:08 GMT Message-Id: <201406162018.s5GKI83u019042@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org using -f From: op@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r269643 - soc2014/op/tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2014 20:18:09 -0000 Author: op Date: Mon Jun 16 20:18:07 2014 New Revision: 269643 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269643 Log: updated build_kernel_* tools, this fixed cross build issues "Also, I’d strongly recommend doing it as two invocations to make, not one. kernel-toolchain likely doesn’t have all the right guards in place for it that buildworld likely does." Suggested-by: Warner Losh Signed-off-by: Oliver Pinter Modified: soc2014/op/tools/build_kernel_32bit.csh soc2014/op/tools/build_kernel_64bit.csh Modified: soc2014/op/tools/build_kernel_32bit.csh ============================================================================== --- soc2014/op/tools/build_kernel_32bit.csh Mon Jun 16 19:16:13 2014 (r269642) +++ soc2014/op/tools/build_kernel_32bit.csh Mon Jun 16 20:18:07 2014 (r269643) @@ -1,13 +1,25 @@ #!/bin/csh -setenv MACHINE amd64 -setenv MACHINE_ARCH amd64 setenv TARGET i386 setenv TARGET_ARCH i386 setenv MAKEOBJDIRPREFIX /tmp/objdir +setenv DESTDIR /tmp/kernelbuild @ __freebsd_mk_jobs = `sysctl -n kern.smp.cpus` + 1 set current_dir = `pwd` set _current_dir = `echo ${current_dir} | sed -e 's|\(.*/\)\(.*\.git\)\(/.*\)*|\2|g'` +set _date=`date "+%Y%m%d%H%M%S"` + +if ( "`sysctl -n security.bsd.hardlink_check_uid`" == "1" ) then + echo "build will fail, due to hard security checks" + echo "sysctl security.bsd.hardlink_check_uid=0" + exit +endif + +if ( "`sysctl -n security.bsd.hardlink_check_gid`" == "1" ) then + echo "build will fail, due to hard security checks" + echo "sysctl security.bsd.hardlink_check_gid=0" + exit +endif if ( (${_current_dir} != "hardenedBSD.git")) then if ((${_current_dir} != "opBSD.git")) then @@ -20,4 +32,5 @@ test -d $MAKEOBJDIRPREFIX || mkdir $MAKEOBJDIRPREFIX -(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs KERNCONF=GENERIC kernel-toolchain buildkernel) |& tee /tmp/cc-log-${_current_dir}-`date "+%Y%m%d%H%M%S"` +(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel-toolchain) |& tee /tmp/cc-log-${_current_dir}-${_date} +(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC buildkernel) |& tee -a /tmp/cc-log-${_current_dir}-${_date} Modified: soc2014/op/tools/build_kernel_64bit.csh ============================================================================== --- soc2014/op/tools/build_kernel_64bit.csh Mon Jun 16 19:16:13 2014 (r269642) +++ soc2014/op/tools/build_kernel_64bit.csh Mon Jun 16 20:18:07 2014 (r269643) @@ -1,10 +1,23 @@ #!/bin/csh setenv MAKEOBJDIRPREFIX /tmp/objdir -setenv DESTDIR /tmp/kernelbuild +setenv DESTDIR /tmp/kernelbuild @ __freebsd_mk_jobs = `sysctl -n kern.smp.cpus` + 1 set current_dir = `pwd` set _current_dir = `echo ${current_dir} | sed -e 's|\(.*/\)\(.*\.git\)\(/.*\)*|\2|g'` +set _date=`date "+%Y%m%d%H%M%S"` + +if ( "`sysctl -n security.bsd.hardlink_check_uid`" == "1" ) then + echo "build will fail, due to hard security checks" + echo "sysctl security.bsd.hardlink_check_uid=0" + exit +endif + +if ( "`sysctl -n security.bsd.hardlink_check_gid`" == "1" ) then + echo "build will fail, due to hard security checks" + echo "sysctl security.bsd.hardlink_check_gid=0" + exit +endif if ( (${_current_dir} != "hardenedBSD.git")) then if ((${_current_dir} != "opBSD.git")) then @@ -17,4 +30,5 @@ test -d $MAKEOBJDIRPREFIX || mkdir $MAKEOBJDIRPREFIX -(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel) |& tee /tmp/cc-log-${_current_dir}-`date "+%Y%m%d%H%M%S"` +(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel-toolchain) |& tee /tmp/cc-log-${_current_dir}-${_date} +(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC buildkernel) |& tee -a /tmp/cc-log-${_current_dir}-${_date}