svn commit: r258952 - in stable/10: release release/scripts share/man/man7

[Glen Barber]

Author: gjb
Date: Thu Dec  5 00:59:29 2013
New Revision: 258952
URL: http://svnweb.freebsd.org/changeset/base/258952

Log:
  MFC r258786, r258796, r258797, r258847, r258853, r258949:
  
  r258786:
    Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise
    the textproc/docproj port build fails.
  
  r258796 (hrs):
    - Prevent TARGET and TARGET_ARCH from being defined as empty when
      TARGET="" and/or TARGET_ARCH="" is specified.
    - Remove extra ().
  
  r258797 (hrs):
    Use standard CLEANFILES/CLEANDIRS and clean target in bsd.obj.mk.
  
  r258847:
    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,
  
  r258853:
    Turn off the dvdrom target by default.  dvd1.iso is now built by
    specifying 'WITH_DVD=1' during 'make release'.
  
    This caused some problems during the freebsd-update builds for
    10.0-BETA4.
  
  r258949:
    Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluating
    to true.
  
  Approved by:	re (hrs)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile
  stable/10/release/release.sh
  stable/10/release/scripts/pkg-stage.sh
  stable/10/share/man/man7/release.7
Directory Properties:
  stable/10/release/   (props changed)
  stable/10/share/man/man7/   (props changed)

Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile	Thu Dec  5 00:57:53 2013	(r258951)
+++ stable/10/release/Makefile	Thu Dec  5 00:59:29 2013	(r258952)
@@ -18,7 +18,7 @@
 #  NOPORTS:  if set, do not distribute ports tree
 #  NOSRC:    if set, do not distribute source tree
 #  NODOC:    if set, do not generate release documentation
-#  NODVD:    if set, do not generate dvd1.iso
+#  WITH_DVD: if set, generate dvd1.iso
 #  TARGET/TARGET_ARCH: architecture of built release 
 #
 
@@ -27,11 +27,15 @@ PORTSDIR?=	/usr/ports
 DOCDIR?=	/usr/doc
 RELNOTES_LANG?= en_US.ISO8859-1
 
-TARGET?=	${MACHINE}
+.if !defined(TARGET) || empty(TARGET)
+TARGET=		${MACHINE}
+.endif
+.if !defined(TARGET_ARCH) || empty(TARGET_ARCH)
 .if ${TARGET} == ${MACHINE}
-TARGET_ARCH?=	${MACHINE_ARCH}
+TARGET_ARCH=	${MACHINE_ARCH}
 .else
-TARGET_ARCH?=	${TARGET}
+TARGET_ARCH=	${TARGET}
+.endif
 .endif
 IMAKE=		${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
 DISTDIR=	dist
@@ -73,7 +77,7 @@ IMAGES=
 .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
 RELEASE_TARGETS+= cdrom
 IMAGES+=	disc1.iso bootonly.iso
-. if(!defined(NODVD))
+. if defined(WITH_DVD) && !empty(WITH_DVD)
 RELEASE_TARGETS+= dvdrom
 IMAGES+=	dvd1.iso
 . endif
@@ -83,7 +87,12 @@ RELEASE_TARGETS+= memstick.img
 IMAGES+=	memstick.img
 .endif
 
+CLEANFILES=	packagesystem *.txz MANIFEST system ${IMAGES}
+CLEANDIRS=	dist ftp release bootonly dvd
+beforeclean:
+	chflags -R noschg .
 .include <bsd.obj.mk>
+clean: beforeclean
 
 base.txz:
 	mkdir -p ${DISTDIR}
@@ -220,15 +229,6 @@ release:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
 
-clean:
-	chflags -R noschg .
-	rm -rf dist ftp
-	rm -f packagesystem
-	rm -f *.txz MANIFEST
-	rm -f system
-	rm -rf release bootonly dvd
-	rm -f ${IMAGES}
-
 install:
 .if defined(DESTDIR) && !empty(DESTDIR)
 	mkdir -p ${DESTDIR}

Modified: stable/10/release/release.sh
==============================================================================
--- stable/10/release/release.sh	Thu Dec  5 00:57:53 2013	(r258951)
+++ stable/10/release/release.sh	Thu Dec  5 00:59:29 2013	(r258952)
@@ -176,9 +176,9 @@ build_doc_ports() {
 	_OSVERSION=$(sysctl -n kern.osreldate)
 	if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then
 		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
-		PBUILD_FLAGS="${PBUILD_FLAGS} OPTIONS_UNSET='FOP IGOR'"
+		PBUILD_FLAGS="${PBUILD_FLAGS}"
 		chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
-			${PBUILD_FLAGS} install clean distclean
+			${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
 	fi
 }
 

Modified: stable/10/release/scripts/pkg-stage.sh
==============================================================================
--- stable/10/release/scripts/pkg-stage.sh	Thu Dec  5 00:57:53 2013	(r258951)
+++ stable/10/release/scripts/pkg-stage.sh	Thu Dec  5 00:59:29 2013	(r258952)
@@ -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}

Modified: stable/10/share/man/man7/release.7
==============================================================================
--- stable/10/share/man/man7/release.7	Thu Dec  5 00:57:53 2013	(r258951)
+++ stable/10/share/man/man7/release.7	Thu Dec  5 00:59:29 2013	(r258952)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 18, 2013
+.Dd December 2, 2013
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -230,10 +230,6 @@ When set,
 will prevent the
 .Fa doc.txz
 distribution package from being created.
-.It Va NODVD
-Set to a non-empty value to skip the
-.Cm dvdrom
-target.
 .It Va NOPORTS
 Set to a non-empty value to skip the
 .Li ports/
@@ -245,6 +241,10 @@ will prevent the
 distribution package from being created.
 Setting this also sets
 .Va NODOC .
+.It Va WITH_DVD
+Set to a non-empty value to include the
+.Cm dvdrom
+target.
 .El
 .Sh MAKEFILE TARGETS
 The release makefile