Project

General

Profile

« Previous | Next » 

Revision 697cd601

Added by Renato Botelho about 9 years ago

Export __MAKE_CONF, variable name used by FreeBSD and stop adding it to build commands

View differences:

tools/builder_common.sh
334 334 
	fi
335 335 

  		




  336
  336
  
    
	# Set default parameters


  		




  337
  
  
    
	export MAKE_ARGS="${MAKEJ_WORLD} __MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"


  		




  
  337
  
    
	export MAKE_ARGS="${MAKEJ_WORLD} SRCCONF=${SRC_CONF} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"


  		




  338
  338
  
    

  		




  339
  339
  
    
	echo ">>> LOGFILE set to $LOGFILE." | tee -a ${LOGFILE}


  		




  340
  340
  
    
	makeargs="${MAKE_ARGS}"


  		




  ......




  1688
  1688
  
    
	echo ">>> ARCH:        ${TARGET}"


  		




  1689
  1689
  
    
	echo ">>> SRC_CONF:    ${SRCCONFBASENAME}"


  		




  1690
  1690
  
    

  		




  1691
  
  
    
	makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}"


  		




  
  1691
  
    
	makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}"


  		




  1692
  1692
  
    
	echo ">>> Builder is running the command: script -aq $LOGFILE make -DNO_KERNELCLEAN $makeargs buildkernel KERNCONF=${KERNCONF}" | tee -a $LOGFILE


  		




  1693
  1693
  
    
	(script -q $LOGFILE make -C ${FREEBSD_SRC_DIR} -DNO_KERNELCLEAN $makeargs buildkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>'


  		




  1694
  1694
  
    
}


  		




  ......




  1706
  1706
  
    
	fi


  		




  1707
  1707
  
    

  		




  1708
  1708
  
    
	mkdir -p ${STAGE_CHROOT_DIR}/boot


  		




  1709
  
  
    
	makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DESTDIR=${KERNEL_DESTDIR}"


  		




  
  1709
  
    
	makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DESTDIR=${KERNEL_DESTDIR}"


  		




  1710
  1710
  
    
	echo ">>> Builder is running the command: script -aq $LOGFILE make ${makeargs} installkernel KERNCONF=${KERNCONF}"  | tee -a $LOGFILE


  		




  1711
  1711
  
    
	(script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>'


  		




  1712
  1712
  
    
	gzip -f9 $KERNEL_DESTDIR/boot/kernel/kernel


  		












Also available in:  Unified diff