svn commit: r293452 - head/release

Glen Barber gjb at FreeBSD.org
Sat Jan 9 00:45:40 UTC 2016


Author: gjb
Date: Sat Jan  9 00:45:38 2016
New Revision: 293452
URL: https://svnweb.freebsd.org/changeset/base/293452

Log:
  Set FORCE_PKG_REGISTER=1 when installing packages to avoid failures
  when re-using build chroot(8) environments.
  
  This is based on the patch in the PR referenced below, but instead
  of using 'reinstall' in two locations (one of which already uses
  FORCE_PKG_REGISTER=1), changes the non-embedded behavior.
  
  PR:		205998
  Submitted by:	ngie
  MFC after:	5 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Sat Jan  9 00:43:11 2016	(r293451)
+++ head/release/release.sh	Sat Jan  9 00:45:38 2016	(r293452)
@@ -275,6 +275,7 @@ extra_chroot_setup() {
 			PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
 			chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
 				${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
+				FORCE_PKG_REGISTER=1 \
 				install clean distclean
 		fi
 	fi


More information about the svn-src-head mailing list