socsvn commit: r269643 - soc2014/op/tools

[op at FreeBSD.org]

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 <imp@>
  Signed-off-by: Oliver Pinter <oliver.pntr at gmail.com>
  

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}