Date: Fri, 18 Jul 2014 07:40:25 GMT From: op@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271051 - soc2014/op/tools Message-ID: <201407180740.s6I7ePce043462@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: op Date: Fri Jul 18 07:40:24 2014 New Revision: 271051 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271051 Log: updated build tools Signed-off-by: Oliver Pinter <oliver.pntr@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 Fri Jul 18 06:58:01 2014 (r271050) +++ soc2014/op/tools/build_kernel_32bit.csh Fri Jul 18 07:40:24 2014 (r271051) @@ -2,14 +2,16 @@ setenv TARGET i386 setenv TARGET_ARCH i386 -setenv MAKEOBJDIRPREFIX "/tmp/objdir_${TARGET}" -setenv DESTDIR /tmp/kernelbuild +setenv __MAKE_CONF /dev/null +setenv MAKEOBJDIRPREFIX "/tmp/${TARGET}-objdir" +setenv DESTDIR /tmp/${TARGET}-kernel @ __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 _current_realdir = `echo ${current_dir} | sed -e 's|\(.*/\)\(.*\.git\)\(/.*\)*|\1/\2|g'` set _check_toolchain = "${MAKEOBJDIRPREFIX}/___kernel-toolchain_DONE" set _date=`date "+%Y%m%d%H%M%S"` +set _log="/tmp/${TARGET}-cc-log-${_current_dir}-${_date}" if ( "`sysctl -n security.bsd.hardlink_check_uid`" == "1" ) then echo "build will fail, due to hard security checks" @@ -37,10 +39,10 @@ endif if ( ! -f ${_check_toolchain} ) then - (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} || exit + (cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel-toolchain) |& tee ${_log} || exit touch ${_check_toolchain} else echo "skip make kernel-toolchain" sleep 1 endif -(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} +(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel) |& tee -a ${_log} Modified: soc2014/op/tools/build_kernel_64bit.csh ============================================================================== --- soc2014/op/tools/build_kernel_64bit.csh Fri Jul 18 06:58:01 2014 (r271050) +++ soc2014/op/tools/build_kernel_64bit.csh Fri Jul 18 07:40:24 2014 (r271051) @@ -1,13 +1,16 @@ #!/bin/csh -setenv MAKEOBJDIRPREFIX /tmp/objdir -setenv DESTDIR /tmp/kernelbuild +setenv TARGET amd64 +setenv MAKEOBJDIRPREFIX /tmp/${TARGET}-objdir +setenv __MAKE_CONF /dev/null +setenv DESTDIR /tmp/${TARGET}-kernel @ __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 _current_realdir = `echo ${current_dir} | sed -e 's|\(.*/\)\(.*\.git\)\(/.*\)*|\1/\2|g'` set _check_toolchain = "${MAKEOBJDIRPREFIX}/___kernel-toolchain_DONE" set _date=`date "+%Y%m%d%H%M%S"` +set _log="/tmp/${TARGET}-cc-log-${_current_dir}-${_date}" if ( "`sysctl -n security.bsd.hardlink_check_uid`" == "1" ) then echo "build will fail, due to hard security checks" @@ -35,10 +38,10 @@ endif if ( ! -f ${_check_toolchain} ) then - (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} || exit + (cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel-toolchain) |& tee ${_log} || exit touch ${_check_toolchain} else echo "skip make kernel-toolchain" sleep 1 endif -(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} +(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel) |& tee -a ${_log}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407180740.s6I7ePce043462>