svn commit: r258847 - head/release/scripts

Glen Barber gjb at FreeBSD.org
Mon Dec 2 14:28:31 UTC 2013


Author: gjb
Date: Mon Dec  2 14:28:30 2013
New Revision: 258847
URL: http://svnweb.freebsd.org/changeset/base/258847

Log:
  Provide reproducibility between builds by building pkg(8) from ports,
  instead of using pkg-bootstrap.
  
  This should resolve a problem that was discovered during 10.0-BETA4
  freebsd-update(8) builds,
  
  Reported by:	secteam (delphij)
  MFC after:	3 days
  X-MFC-to-10:	possibly immediately, pending freebsd-update(8) builds
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/scripts/pkg-stage.sh

Modified: head/release/scripts/pkg-stage.sh
==============================================================================
--- head/release/scripts/pkg-stage.sh	Mon Dec  2 14:26:57 2013	(r258846)
+++ head/release/scripts/pkg-stage.sh	Mon Dec  2 14:28:30 2013	(r258847)
@@ -25,7 +25,7 @@ REVISION="${2}"
 . "${1}" || exit 1
 
 if [ ! -x /usr/local/sbin/pkg ]; then
-	/usr/sbin/pkg bootstrap	
+	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi
 
 /bin/mkdir -p ${PKG_CACHEDIR}


More information about the svn-src-all mailing list