svn commit: r252101 - head/release

Glen Barber gjb at FreeBSD.org
Sat Jun 22 22:12:24 UTC 2013


Author: gjb
Date: Sat Jun 22 22:12:24 2013
New Revision: 252101
URL: http://svnweb.freebsd.org/changeset/base/252101

Log:
  If MAKE_CONF and/or SRC_CONF are set and not character devices,
  copy to chroot to use with release build.
  
  Submitted by:	Garrett Cooper (original version)
  Approved by:	kib (mentor)
  MFC after:	1 week

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Sat Jun 22 21:58:21 2013	(r252100)
+++ head/release/release.sh	Sat Jun 22 22:12:24 2013	(r252101)
@@ -171,6 +171,17 @@ build_doc_ports() {
 	fi
 }
 
+# If MAKE_CONF and/or SRC_CONF are set and not character devices (/dev/null),
+# copy them to the chroot.
+if [ -e ${MAKE_CONF} ] && [ ! -c ${MAKE_CONF} ]; then
+	mkdir -p ${CHROOTDIR}/$(dirname ${MAKE_CONF})
+	cp ${MAKE_CONF} ${CHROOTDIR}/${MAKE_CONF}
+fi
+if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CONF} ]; then
+	mkdir -p ${CHROOTDIR}/$(dirname ${SRC_CONF})
+	cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF}
+fi
+
 if [ -d ${CHROOTDIR}/usr/ports ]; then
 	cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
 	build_doc_ports ${CHROOTDIR}


More information about the svn-src-all mailing list