svn commit: r250118 - in stable/9: . usr.sbin/mergemaster

[Brooks Davis]

Author: brooks
Date: Tue Apr 30 20:15:53 2013
New Revision: 250118
URL: http://svnweb.freebsd.org/changeset/base/250118

Log:
  MFC r249906:
  
  Use the system MAKEOBJDIRPREFIX when running make targets in
  mergemaster.  This allows bootstrap verions of tools to be used.
  
  Add a note to UPDATING about this change.
  
  This commit is a partial backout of r248531 in that it removes an
  accidentally committed change to mergemaster.
  
  Discussed with:	jhb
  Sponsored by:	DARPA, AFRL

Modified:
  stable/9/UPDATING   (contents, props changed)
  stable/9/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/9/usr.sbin/mergemaster/   (props changed)

Modified: stable/9/UPDATING
==============================================================================
--- stable/9/UPDATING	Tue Apr 30 19:57:21 2013	(r250117)
+++ stable/9/UPDATING	Tue Apr 30 20:15:53 2013	(r250118)
@@ -11,6 +11,16 @@ handbook:
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
+20130430:
+	The mergemaster command now uses the default MAKEOBJDIRPREFIX
+	rather than creating it's own in the temporary directory in
+	order allow access to bootstrapped versions of tools such as
+	install and mtree.  When upgrading from version of FreeBSD where
+	the install command does not support -l, you will need to
+	install a new mergemaster command if mergemaster -p is required.
+	This can be accomplished with the command (cd src/usr.sbin/mergemaster
+	&& make install).
+
 20130429:
 	Fix a bug that allows NFS clients to issue READDIR on files.
 
@@ -1535,7 +1545,7 @@ COMMON ITEMS:
 	step.  It never hurts to do it all the time.  You may need to
 	install a new mergemaster (cd src/usr.sbin/mergemaster && make
 	install) after the buildworld before this step if you last updated
-	from current before 20020224 or from -stable before 20020408.
+	from [78]-stable or 9-stable before 20130430.
 
 	[6] This only deletes old files and directories. Old libraries
 	can be deleted by "make delete-old-libs", but you have to make

Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/9/usr.sbin/mergemaster/mergemaster.sh	Tue Apr 30 19:57:21 2013	(r250117)
+++ stable/9/usr.sbin/mergemaster/mergemaster.sh	Tue Apr 30 20:15:53 2013	(r250118)
@@ -629,16 +629,10 @@ case "${RERUN}" in
         ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs >/dev/null
         ;;
       esac
-      if [ -d `${MM_MAKE} -V .OBJDIR` ]; then
-	od=`${MM_MAKE} -V MAKEOBJDIRPREFIX`
-      else
-        od=${TEMPROOT}/usr/obj
-      fi
-      echo $od 1>&2
       ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs >/dev/null &&
-      MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc >/dev/null &&
-      MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc >/dev/null &&
-      MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution >/dev/null;} ||
+      ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc >/dev/null &&
+      ${MM_MAKE} everything SUBDIR_OVERRIDE=etc >/dev/null &&
+      ${MM_MAKE} DESTDIR=${TEMPROOT} distribution >/dev/null;} ||
     { echo '';
      echo "  *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
       echo "      the temproot environment";